The Android Automerger
|
3fb1f94860
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-17 06:59:59 -07:00 |
|
Baligh Uddin
|
8c602c3053
|
am 6f5fc1ae: (-s ours) am b09626cf: am 8e3f8d3a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '6f5fc1ae80a5015213037a7f6e30b6bb1317e889':
Import translations. DO NOT MERGE
|
2012-10-16 22:07:54 -07:00 |
|
Baligh Uddin
|
6f5fc1ae80
|
am b09626cf: am 8e3f8d3a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b09626cf2086b0eb61ccb03f56025a8e5ae18a2d':
Import translations. DO NOT MERGE
|
2012-10-16 22:05:05 -07:00 |
|
Baligh Uddin
|
b09626cf20
|
am 8e3f8d3a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8e3f8d3af576648cc73181d3ba2a89c107dffc75':
Import translations. DO NOT MERGE
|
2012-10-16 22:02:35 -07:00 |
|
Baligh Uddin
|
36c04c3448
|
Merge "Import translations. DO NOT MERGE"
|
2012-10-16 22:01:55 -07:00 |
|
Baligh Uddin
|
8e3f8d3af5
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
2012-10-16 22:00:46 -07:00 |
|
Baligh Uddin
|
2c8b17ffa6
|
am cd80f53c: (-s ours) am ff45b71a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'cd80f53c161050d02c079cab9537b606783abca4':
Import translations. DO NOT MERGE
|
2012-10-16 22:00:07 -07:00 |
|
Baligh Uddin
|
cd80f53c16
|
am ff45b71a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'ff45b71a8930840f93a1c650e34226bf52f3e697':
Import translations. DO NOT MERGE
|
2012-10-16 21:58:29 -07:00 |
|
Baligh Uddin
|
ff45b71a89
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2012-10-16 21:57:18 -07:00 |
|
The Android Automerger
|
676f4457de
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-16 17:31:09 -07:00 |
|
Vikram Aggarwal
|
48eb0f36c4
|
am 6e69b8ad: am 478bac83: am f487e2ad: Remove clock
* commit '6e69b8ad02126bb225a8c5b59e2d32b563b4ea4a':
Remove clock
|
2012-10-16 15:52:13 -07:00 |
|
Vikram Aggarwal
|
6e69b8ad02
|
am 478bac83: am f487e2ad: Remove clock
* commit '478bac83ffab9b8f840f74d627f399e7a44b1309':
Remove clock
|
2012-10-16 15:49:39 -07:00 |
|
Vikram Aggarwal
|
478bac83ff
|
am f487e2ad: Remove clock
* commit 'f487e2ade0fe222b21ff85ed47789c51209f5965':
Remove clock
|
2012-10-16 15:47:41 -07:00 |
|
Baligh Uddin
|
cfb1e759c1
|
Import translations. DO NOT MERGE
Change-Id: I3fcee135bcd7c555f7d642f72098e2e78c324b30
Auto-generated-cl: translation import
|
2012-10-16 15:29:24 -07:00 |
|
Baligh Uddin
|
808b74f76e
|
Import translations. DO NOT MERGE
Change-Id: Ica70679f4072603b62a08f46d26f1625a5820788
Auto-generated-cl: translation import
|
2012-10-16 15:26:58 -07:00 |
|
Baligh Uddin
|
ad9ae205c8
|
Import translations. DO NOT MERGE
Change-Id: Ide3fcbbe400e9e6663575e2b0c41c1c50b5ed7e9
Auto-generated-cl: translation import
|
2012-10-16 15:25:46 -07:00 |
|
Vikram Aggarwal
|
f487e2ade0
|
Remove clock
Bug: 7267695 time on "decrypt storage" page is wrong
Change-Id: I582e758006f0e01aedaffc6c9310d550abb56000
|
2012-10-16 15:23:19 -07:00 |
|
Romain Guy
|
b86c2e54a2
|
am fd0a3d08: am a1090b41: am 891185a4: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
* commit 'fd0a3d08238c6c924e702266da58e3d8f512a94c':
New developer setting: force 4x MSAA
|
2012-10-16 09:49:10 -07:00 |
|
Romain Guy
|
fd0a3d0823
|
am a1090b41: am 891185a4: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
* commit 'a1090b417afff240ef448b4af167541fd7d06ff0':
New developer setting: force 4x MSAA
|
2012-10-16 09:47:37 -07:00 |
|
Romain Guy
|
a1090b417a
|
am 891185a4: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
* commit '891185a4fa836c1d386eda0667cf34e293380b48':
New developer setting: force 4x MSAA
|
2012-10-16 09:46:18 -07:00 |
|
Romain Guy
|
891185a4fa
|
Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
|
2012-10-16 09:44:59 -07:00 |
|
Baligh Uddin
|
842931fd2d
|
am 5db3e789: (-s ours) am bd7c4d94: am a9fada40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '5db3e789313f3950b8356f919fc572f8faad9c63':
Import translations. DO NOT MERGE
|
2012-10-16 09:37:57 -07:00 |
|
Baligh Uddin
|
5db3e78931
|
am bd7c4d94: am a9fada40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'bd7c4d9493ce3e80658db0a9af978e9ee6f810b8':
Import translations. DO NOT MERGE
|
2012-10-16 09:35:00 -07:00 |
|
Baligh Uddin
|
f4c04e94cc
|
am 62323cd6: (-s ours) am ae101baf: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '62323cd60b4d9b964d65850b15a9a9f7532626ee':
Import translations. DO NOT MERGE
|
2012-10-16 09:34:53 -07:00 |
|
Baligh Uddin
|
62323cd60b
|
am ae101baf: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'ae101baf6960ce70f4acb33cfe1e68bf3c50c5a7':
Import translations. DO NOT MERGE
|
2012-10-16 09:31:59 -07:00 |
|
Baligh Uddin
|
bd7c4d9493
|
am a9fada40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a9fada4069592f2a7053bc049eeebd1330af7e7e':
Import translations. DO NOT MERGE
|
2012-10-16 09:31:43 -07:00 |
|
Baligh Uddin
|
d6a094c7d7
|
Merge "Import translations. DO NOT MERGE"
|
2012-10-16 09:30:02 -07:00 |
|
Baligh Uddin
|
a9fada4069
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
2012-10-16 09:29:04 -07:00 |
|
Baligh Uddin
|
ae101baf69
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2012-10-16 09:28:39 -07:00 |
|
The Android Automerger
|
87a620a304
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-16 07:00:00 -07:00 |
|
Romain Guy
|
6a9a3e765a
|
New developer setting: force 4x MSAA
Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
|
2012-10-15 19:22:57 -07:00 |
|
Amith Yamasani
|
3b21bb8905
|
am 2d6bff1f: am bb9b54bb: am c20e5e34: Align text in Language & input screen
* commit '2d6bff1fb6d8839eb029694f45a72237084ba879':
Align text in Language & input screen
|
2012-10-15 14:04:46 -07:00 |
|
Amith Yamasani
|
2d6bff1fb6
|
am bb9b54bb: am c20e5e34: Align text in Language & input screen
* commit 'bb9b54bba66c38734007f8f405fa8e556d6bab96':
Align text in Language & input screen
|
2012-10-15 14:02:38 -07:00 |
|
Amith Yamasani
|
bb9b54bba6
|
am c20e5e34: Align text in Language & input screen
* commit 'c20e5e3450c4ed26a25cca3be8c2a6902fd3dd72':
Align text in Language & input screen
|
2012-10-15 14:01:21 -07:00 |
|
Amith Yamasani
|
c20e5e3450
|
Align text in Language & input screen
Bug: 7336478
Change-Id: I38e916e851cbae3284970fe8d8764a6a6018b0ff
|
2012-10-15 13:34:13 -07:00 |
|
The Android Automerger
|
daabb12933
|
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
2012-10-15 12:31:25 -07:00 |
|
The Android Open Source Project
|
b62576cd6e
|
am 0f1f311e: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '0f1f311e23dd6fb4a6b857a414ab2f983705f7f8':
|
2012-10-15 07:43:06 -07:00 |
|
The Android Open Source Project
|
0f1f311e23
|
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I89606e4cfc5d0c61062838b250a8ee92fdc691ce
|
2012-10-15 07:40:31 -07:00 |
|
The Android Automerger
|
ddddcddae5
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-15 06:59:45 -07:00 |
|
Jason Chen
|
fbb986e500
|
am 41386e2a: am ded87c82: am 2b62fcb3: Merge "Let\'s enhance" into jb-mr1-dev
* commit '41386e2acaaf7e3fe3a00b26a552993d891550ab':
Let's enhance
|
2012-10-14 23:07:54 -07:00 |
|
Jason Chen
|
41386e2aca
|
am ded87c82: am 2b62fcb3: Merge "Let\'s enhance" into jb-mr1-dev
* commit 'ded87c824eb8836f079376b4697a90a5e2f1f8e6':
Let's enhance
|
2012-10-14 23:05:03 -07:00 |
|
Jason Chen
|
ded87c824e
|
am 2b62fcb3: Merge "Let\'s enhance" into jb-mr1-dev
* commit '2b62fcb3e629b59ed8cfaf26c3b712f8bb9bd352':
Let's enhance
|
2012-10-14 23:02:51 -07:00 |
|
Jason Chen
|
2b62fcb3e6
|
Merge "Let's enhance" into jb-mr1-dev
|
2012-10-14 23:01:35 -07:00 |
|
Dianne Hackborn
|
c76ceba9ca
|
am 31d866e1: am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev
* commit '31d866e1c612d2391e8b279addd052ac779c503b':
Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
|
2012-10-14 11:13:20 -07:00 |
|
Dianne Hackborn
|
31d866e1c6
|
am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev
* commit 'a4eabfde0054a28ff9cc0d35fc05b9fdb881d513':
Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
|
2012-10-14 11:11:26 -07:00 |
|
Dianne Hackborn
|
a4eabfde00
|
am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev
* commit 'bc3cab99e36e3e757770eaaa02664c1ec193367a':
Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
|
2012-10-14 11:09:38 -07:00 |
|
Dianne Hackborn
|
bc3cab99e3
|
Merge "Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates" into jb-mr1-dev
|
2012-10-14 11:07:46 -07:00 |
|
The Android Automerger
|
d1d08621c5
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-13 03:50:23 -07:00 |
|
Adam Powell
|
e19424f29d
|
am fcf460eb: am cc7f6e92: am a5f6762a: Show the overflow in the right place for keyguard settings
* commit 'fcf460eb874953fd663711fe7d6164f700d181ae':
Show the overflow in the right place for keyguard settings
|
2012-10-13 01:32:22 -07:00 |
|
Adam Powell
|
fcf460eb87
|
am cc7f6e92: am a5f6762a: Show the overflow in the right place for keyguard settings
* commit 'cc7f6e924de10778ca035385bdc5735ef821dee8':
Show the overflow in the right place for keyguard settings
|
2012-10-13 01:29:47 -07:00 |
|