 The Android Open Source Project
|
f5fb2a0656
|
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f
|
2012-10-12 07:32:00 -07:00 |
|
 Romain Guy
|
4d36be5ac4
|
am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
* commit 'cc69ee77b0a96baa75499c1a116d8cbbfce7422f':
Remove unnecessary allocations during draw Bug #7327799
|
2012-10-11 17:11:14 -07:00 |
|
 The Android Automerger
|
5f2aa980c3
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-11 16:26:53 -07:00 |
|
|
Romain Guy
|
cc69ee77b0
|
am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
* commit '0d06152d4026e933d8308002e1d53ca4eba6cad2':
Remove unnecessary allocations during draw Bug #7327799
|
2012-10-11 11:12:57 -07:00 |
|
|
Romain Guy
|
0d06152d40
|
Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
|
2012-10-11 11:10:47 -07:00 |
|
 Michael Jurka
|
74c697c710
|
am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
* commit '80d64c28f45e0378e05021dc9222982b3d67150e':
Add entries for string resources that appear in clings
|
2012-10-11 08:26:07 -07:00 |
|
|
Michael Jurka
|
80d64c28f4
|
am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
* commit 'dfe0c29383049b269094a51fd74e693a8cb9b5b0':
Add entries for string resources that appear in clings
|
2012-10-11 08:24:57 -07:00 |
|
|
Michael Jurka
|
dfe0c29383
|
Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
|
2012-10-11 08:23:10 -07:00 |
|
|
The Android Automerger
|
3e40565ed1
|
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
2012-10-11 08:19:41 -07:00 |
|
|
The Android Open Source Project
|
c476f09d4a
|
Reconcile with jb-mr1-release - do not merge
Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96
|
2012-10-11 08:05:52 -07:00 |
|
|
The Android Automerger
|
efd3b17e64
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-11 07:04:12 -07:00 |
|
|
The Android Open Source Project
|
af503b0444
|
Reconcile with jb-mr1-release - do not merge
Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7
|
2012-10-11 05:57:54 -07:00 |
|
|
Michael Jurka
|
22beb9043e
|
Add entries for string resources that appear in clings
|
2012-10-11 11:04:43 +02:00 |
|
 Baligh Uddin
|
eddbe4e994
|
am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '61854931252710cedbb596918dee6524723d1223':
Revert "Import translations. DO NOT MERGE"
|
2012-10-10 21:18:36 -07:00 |
|
|
Baligh Uddin
|
9fe1a25ba8
|
am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
* commit 'ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
Revert "Import translations. DO NOT MERGE"
|
2012-10-10 21:16:59 -07:00 |
|
|
Baligh Uddin
|
6185493125
|
am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '260eb9c6ff598d792b51e5c24608602a1f5b1504':
Revert "Import translations. DO NOT MERGE"
|
2012-10-10 21:16:54 -07:00 |
|
|
Baligh Uddin
|
ae5a2a4a4e
|
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
|
2012-10-10 21:14:57 -07:00 |
|
|
Baligh Uddin
|
339308c1e0
|
Revert "Import translations. DO NOT MERGE"
broken build
This reverts commit 4caeee6e08
Change-Id: Ie3456538cf40d34ca9d1121cc523f968f2c3a9e2
|
2012-10-10 21:14:47 -07:00 |
|
|
Baligh Uddin
|
260eb9c6ff
|
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
|
2012-10-10 21:14:37 -07:00 |
|
|
Baligh Uddin
|
f371a36e2e
|
Revert "Import translations. DO NOT MERGE"
broken build
This reverts commit 2826bc4fb6
Change-Id: I232f8abdf1fdb592ba76216fc82d836294ca4e09
|
2012-10-10 21:14:29 -07:00 |
|
|
Baligh Uddin
|
9870efdd35
|
am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'db983fa7c46da75469d0042425b41f84b5cdc9ac':
Import translations. DO NOT MERGE
|
2012-10-10 20:58:34 -07:00 |
|
|
Baligh Uddin
|
db983fa7c4
|
am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'f8a49f869d6d0303998e8483ca7f650a0d4e5963':
Import translations. DO NOT MERGE
|
2012-10-10 20:55:53 -07:00 |
|
|
Baligh Uddin
|
a2e9f101bd
|
am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'a7b294057a5ec8f72e8f261ab00960565e4efd3b':
Import translations. DO NOT MERGE
|
2012-10-10 20:55:33 -07:00 |
|
|
Baligh Uddin
|
a7b294057a
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2012-10-10 20:53:39 -07:00 |
|
|
Baligh Uddin
|
f8a49f869d
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
2012-10-10 20:53:20 -07:00 |
|
|
Romain Guy
|
eeacd56cc9
|
Remove unnecessary allocations during draw
Bug #7327799
Change-Id: Ic3a18fb9d850f2c692dcb187a206c61dfa8108a4
|
2012-10-10 18:47:33 -07:00 |
|
|
Michael Jurka
|
8dcd596e76
|
am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev
* commit '37b2bac33e90411f2bfd0ee1117b595dcc2b50d5':
Update custom cling params
|
2012-10-10 14:20:26 -07:00 |
|
|
Michael Jurka
|
37b2bac33e
|
am a433be70: Merge "Update custom cling params" into jb-mr1-dev
* commit 'a433be70632e02e32dfc2e26f03e7cabb7f0e208':
Update custom cling params
|
2012-10-10 14:18:09 -07:00 |
|
|
Michael Jurka
|
a433be7063
|
Merge "Update custom cling params" into jb-mr1-dev
|
2012-10-10 14:15:46 -07:00 |
|
|
Michael Jurka
|
b86d516bcc
|
Update custom cling params
Bug: 7318080
Change-Id: I77d73d81a60efa3886f088e82c6ba3466f6ac331
|
2012-10-10 23:11:01 +02:00 |
|
|
The Android Automerger
|
f72d698ff1
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-10 14:06:57 -07:00 |
|
 Winson Chung
|
47cbf10880
|
am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev
* commit '5ad9b52148740b984509183fe3ecb9d8d81c702b':
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
|
2012-10-10 13:41:37 -07:00 |
|
|
Winson Chung
|
5ad9b52148
|
am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev
* commit '5b589a01cd291ae3599bc3824f6732c109df056a':
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
|
2012-10-10 13:39:31 -07:00 |
|
|
Winson Chung
|
5b589a01cd
|
Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev
|
2012-10-10 13:37:58 -07:00 |
|
|
Baligh Uddin
|
2826bc4fb6
|
Import translations. DO NOT MERGE
Change-Id: Iac3a250c73e5f0b3b80675a1a993c8336ba6ade9
Auto-generated-cl: translation import
|
2012-10-10 11:30:52 -07:00 |
|
|
Baligh Uddin
|
4caeee6e08
|
Import translations. DO NOT MERGE
Change-Id: I689ffb63079d08e7c1d7f172d118b48497a6c1b4
Auto-generated-cl: translation import
|
2012-10-10 11:30:23 -07:00 |
|
|
The Android Open Source Project
|
e37fa97752
|
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286
|
2012-10-10 09:45:34 -07:00 |
|
|
The Android Automerger
|
560e16197a
|
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
2012-10-10 08:57:43 -07:00 |
|
|
The Android Automerger
|
c242ae404d
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-10 06:59:45 -07:00 |
|
|
Michael Jurka
|
5d1e9a5f54
|
am 3bf0359f: am a113121f: Stop using mcc for custom workspace cling on sw600dp devices
* commit '3bf0359f286cd78ef0c64df75914e399320d884f':
Stop using mcc for custom workspace cling on sw600dp devices
|
2012-10-09 17:16:54 -07:00 |
|
|
Michael Jurka
|
3bf0359f28
|
am a113121f: Stop using mcc for custom workspace cling on sw600dp devices
* commit 'a113121fd3c43f1e1d23064e17c540c48fe330cc':
Stop using mcc for custom workspace cling on sw600dp devices
|
2012-10-09 17:14:50 -07:00 |
|
|
Winson Chung
|
2db90f32a1
|
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
Change-Id: I96514f762a1af1ec66523afde7db7a967b625afb
|
2012-10-09 15:05:08 -07:00 |
|
|
The Android Open Source Project
|
7bd31959b1
|
Reconcile with jb-mr1-release - do not merge
Change-Id: I76401e4d503b987805ad009441310290bef71483
|
2012-10-09 07:30:27 -07:00 |
|
|
The Android Automerger
|
37f93295e1
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-09 06:59:47 -07:00 |
|
|
Michael Jurka
|
a113121fd3
|
Stop using mcc for custom workspace cling on sw600dp devices
Bug: 7203884
|
2012-10-09 14:46:26 +02:00 |
|
|
Michael Jurka
|
82c0fe723c
|
am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
* commit '75f63ee49e64abe407ac123068c6e271331e9aee':
Re-merge "Add support for custom manta cling"
|
2012-10-08 13:33:47 -07:00 |
|
|
Michael Jurka
|
a64478fdc2
|
am 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
* commit '570caf27d97de328e8c500bb96f917760bdc12dc':
Fix bug 6886990: cling accessibility
|
2012-10-08 13:32:20 -07:00 |
|
|
Michael Jurka
|
75f63ee49e
|
am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
* commit '98d7bd72df9833b0149dd4772cce710fa4b7476d':
Re-merge "Add support for custom manta cling"
|
2012-10-08 13:31:21 -07:00 |
|
|
Michael Jurka
|
570caf27d9
|
am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
* commit '6c5679e5ddbac06d555f1242a2cf082deb71de21':
Fix bug 6886990: cling accessibility
|
2012-10-08 13:29:56 -07:00 |
|
|
Michael Jurka
|
98d7bd72df
|
Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
|
2012-10-08 13:29:25 -07:00 |
|