Jim Miller
ceff47f2b7
am 81a6b985: Merge "Add test case for new keyguard widget API" into jb-mr1-dev
...
* commit '81a6b985e4abef7b2be291eb8aa0b85cc78cfd2a':
Add test case for new keyguard widget API
2012-09-21 17:49:02 -07:00
Brett Chabot
da07f2624b
am 99f717d7: Fix runtest syntax.
...
* commit '99f717d7d88cdfe55b5a9689544dceac9489f614':
Fix runtest syntax.
2012-09-21 17:47:47 -07:00
Brett Chabot
6a1c1d1217
am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev
...
* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
Make coverage work without test defs.
2012-09-21 17:47:38 -07:00
Yu Shan Emily Lau
0c8fe324e5
am 1e1926db: Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev
...
* commit '1e1926db0775acd045260511e5c2b62e596e377d':
For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard.
2012-09-21 16:25:54 -07:00
Yu Shan Emily Lau
1e1926db07
Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev
2012-09-21 16:24:28 -07:00
Yu Shan Emily Lau
b894c71af8
For the recent SD card access change.
...
The non-zogyte process need to use the
Environment#getLegacyExternalStorage to access the sdcard.
Change-Id: I797d235954defe25e1bd8728f167250e4f9d0fe9
2012-09-21 16:20:12 -07:00
Jim Miller
253dbf5569
am 81a6b985: Merge "Add test case for new keyguard widget API" into jb-mr1-dev
...
* commit '81a6b985e4abef7b2be291eb8aa0b85cc78cfd2a':
Add test case for new keyguard widget API
2012-09-21 15:25:49 -07:00
Jim Miller
81a6b985e4
Merge "Add test case for new keyguard widget API" into jb-mr1-dev
2012-09-21 15:22:28 -07:00
Brett Chabot
523f3f894d
am 99f717d7: Fix runtest syntax.
...
* commit '99f717d7d88cdfe55b5a9689544dceac9489f614':
Fix runtest syntax.
2012-09-21 13:06:16 -07:00
Brett Chabot
99f717d7d8
Fix runtest syntax.
...
Change-Id: Ief41103c14c30d53f6c2fe8af5511386d57894c2
2012-09-21 13:01:03 -07:00
Brett Chabot
834218e7fb
am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev
...
* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
Make coverage work without test defs.
2012-09-21 12:36:19 -07:00
Brett Chabot
e1bb1d3be9
Merge "Make coverage work without test defs." into jb-mr1-dev
2012-09-21 12:33:55 -07:00
Jim Miller
84fb279107
Add test case for new keyguard widget API
...
Change-Id: Ibcb19c15964f4ea4bad36ec102e9aed8b4ea9c41
2012-09-20 23:46:30 -07:00
The Android Open Source Project
6d5b5591aa
am 3ad7d24a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3ad7d24a9f397eae674191946b999d577d21090e':
2012-09-20 12:48:51 -07:00
The Android Open Source Project
3ad7d24a9f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I77d91a9ffb6db5b62cb01f1ddeb288dd50787a8a
2012-09-20 10:35:10 -07:00
Brett Chabot
3dd6d288f5
am f5e9dcd8: am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev
...
* commit 'f5e9dcd82939e5077d003bbcbfd13752debf857b':
Fix install of full build packages.
2012-09-20 09:29:01 -07:00
Brett Chabot
8ac51186a6
Make coverage work without test defs.
...
Change-Id: I946df038e97dc5c2f40a4610d4076e13ab6bde37
2012-09-20 08:06:05 -07:00
The Android Automerger
7281ec92ae
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-20 06:59:26 -07:00
Brett Chabot
6501dc6e07
am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev
...
* commit '42c14447df3f46d1176675c0e021726bf6087519':
Fix install of full build packages.
2012-09-20 06:22:00 -07:00
Brett Chabot
f5e9dcd829
am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev
...
* commit '42c14447df3f46d1176675c0e021726bf6087519':
Fix install of full build packages.
2012-09-20 06:08:13 -07:00
Geremy Condra
5df6da94db
Merge "Fixed runtest to work with python != 2.4"
2012-09-20 00:19:44 -07:00
Brett Chabot
42c14447df
Merge "Fix install of full build packages." into jb-mr1-dev
2012-09-19 17:06:50 -07:00
Brett Chabot
b0b8c7816d
Fix install of full build packages.
...
Change-Id: I8296304b2297d3ac746920f5f2f70096d055a46c
2012-09-19 08:32:56 -07:00
The Android Automerger
00a159d658
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:30 -07:00
Doug Zongker
771623de18
am c7501c25: am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c7501c25717bbe456048fa84e4ea3895c2ed3b97':
center text, fix extents for multiline texts
2012-09-18 17:16:20 -07:00
Doug Zongker
c7501c2571
am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c31f70a3e4b9464742b699f0e3f92f02fee0ddd6':
center text, fix extents for multiline texts
2012-09-18 16:54:30 -07:00
Doug Zongker
c93f5d847e
am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c31f70a3e4b9464742b699f0e3f92f02fee0ddd6':
center text, fix extents for multiline texts
2012-09-18 15:58:11 -07:00
Doug Zongker
c31f70a3e4
center text, fix extents for multiline texts
...
Bug: 7064142
Change-Id: I3c423c54609b28def1db56084190bf10b87f40f8
2012-09-18 15:47:52 -07:00
Baligh Uddin
10562f5f65
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-18 14:45:47 -07:00
Doug Zongker
7b0a137a67
am 608a5afb: update the localizer tool to use all available translations
...
* commit '608a5afb925a25930f4b1a00a23276298a65c80c':
update the localizer tool to use all available translations
2012-09-18 14:03:59 -07:00
Doug Zongker
92d807a5d3
am 87914ead: am 608a5afb: update the localizer tool to use all available translations
...
* commit '87914eadbcec744750115032f1161d0ab14b3d1c':
update the localizer tool to use all available translations
2012-09-18 13:57:09 -07:00
Doug Zongker
87914eadbc
am 608a5afb: update the localizer tool to use all available translations
...
* commit '608a5afb925a25930f4b1a00a23276298a65c80c':
update the localizer tool to use all available translations
2012-09-18 13:48:27 -07:00
Doug Zongker
608a5afb92
update the localizer tool to use all available translations
...
Bug: 7064142
Change-Id: I606b7e2cf4bd2ab58c14af969a98089960100ff5
2012-09-18 12:40:57 -07:00
Baligh Uddin
cb5b7238a3
Import translations. DO NOT MERGE
...
Change-Id: I11f57138ffae5810804fa375d23d6c80f2d67a29
Auto-generated-cl: translation import
2012-09-18 11:31:06 -07:00
Baligh Uddin
33e9e83d46
am 9c41fd53: (-s ours) am 5f25ef04: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9c41fd5377cbcb310e7d6d613ccc186c25990e48':
Import translations. DO NOT MERGE
2012-09-17 12:45:36 -07:00
Eino-Ville Talvala
84e08d35d7
am 7adaeb6e: am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
* commit '7adaeb6ed479f667bceaae0af27fa997eb6afea6':
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
2012-09-17 11:09:05 -07:00
The Android Automerger
4269b2151c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 06:59:25 -07:00
Baligh Uddin
c705b4190b
am 5f25ef04: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c':
Import translations. DO NOT MERGE
2012-09-14 16:10:23 -07:00
Baligh Uddin
9c41fd5377
am 5f25ef04: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c':
Import translations. DO NOT MERGE
2012-09-14 16:10:18 -07:00
Baligh Uddin
5f25ef0412
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-14 16:08:28 -07:00
The Android Automerger
0dfbeaac58
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 14:10:12 -07:00
Baligh Uddin
c6c0faafcf
Import translations. DO NOT MERGE
...
Change-Id: I6805981e7891a3eb4a304e2273f4bdbd04ecb254
Auto-generated-cl: translation import
2012-09-14 13:42:57 -07:00
Baligh Uddin
c2760a00ea
Import translations. DO NOT MERGE
...
Change-Id: I90a11fad1986532f4895f7b7edf682364d387faa
Auto-generated-cl: translation import
2012-09-14 13:42:32 -07:00
Eino-Ville Talvala
ebd423f29b
am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
* commit 'd6046a445fe4e2896cfbd66cf7d5e0545ab34af2':
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
2012-09-14 11:33:46 -07:00
Eino-Ville Talvala
7adaeb6ed4
am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
* commit 'd6046a445fe4e2896cfbd66cf7d5e0545ab34af2':
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
2012-09-14 11:33:35 -07:00
The Android Automerger
23ab3c9d70
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 07:11:06 -07:00
Eino-Ville Talvala
d6046a445f
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
Emulator does not need FORMAT_ZSL, so treat it as
IMPLEMENTATION_DEFINED.
Bug: 6243944
Change-Id: I9eeb48f6197ff9979f7823b8dc912346158fd6f1
2012-09-13 16:33:26 -07:00
Brett Chabot
98ab0fc7e7
am 43655b87: am 91615e7f: Merge "Fix log syntax." into jb-mr1-dev
...
* commit '43655b8774dc5cd20885f0e600e4b2b4b31378de':
Fix log syntax.
2012-09-13 14:12:07 -07:00
Dirk Dougherty
71f5cff534
am 2bac0954: am f9149152: am cebc0dc6: am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
...
* commit '2bac095435c43f3988f3cc0f6bd07ed237fe87e8':
Doc change: Add temporary redirect for dac/live to dgc/live.
2012-09-13 14:04:35 -07:00
Brett Chabot
5f3544a3e8
am 91615e7f: Merge "Fix log syntax." into jb-mr1-dev
...
* commit '91615e7f5a7d55ffa349168108636084bfae25e4':
Fix log syntax.
2012-09-13 10:11:47 -07:00