Dianne Hackborn
|
ecfc127789
|
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
|
2012-02-13 14:39:45 -08:00 |
|
Ramanan Rajeswaran
|
ad2171e33f
|
am 8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
DO NOT MERGE
|
2012-02-13 14:24:38 -08:00 |
|
Ramanan Rajeswaran
|
8fa3ba4f47
|
Merge "DO NOT MERGE" into ics-scoop
|
2012-02-13 14:22:44 -08:00 |
|
Ramanan Rajeswaran
|
9c7058f299
|
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
|
2012-02-13 14:17:06 -08:00 |
|
Tsu Chiang Chuang
|
1f71efd353
|
am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit 'eb56ad183af8a9833ff22a22b97f174f05266c58':
extending timeout to stabilize tests
|
2012-02-13 13:45:06 -08:00 |
|
Tsu Chiang Chuang
|
c1720bacf3
|
am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
|
2012-02-13 13:42:45 -08:00 |
|
Tsu Chiang Chuang
|
0137d87be0
|
Merge "extending timeout to stabilize tests" into ics-mr1
|
2012-02-13 13:41:37 -08:00 |
|
Dianne Hackborn
|
28941b0185
|
am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit 'c1496d2d9a496e4aba817a58ecb9e07fe55cdba5':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
|
2012-02-13 12:38:37 -08:00 |
|
Dianne Hackborn
|
a4ebe8d29a
|
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
|
2012-02-13 12:01:56 -08:00 |
|
Wink Saville
|
ad8550d502
|
am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit 'f11b6fbfc8bab9a09e37ef9866c0da247474f4cf':
|
2012-02-10 15:28:54 -08:00 |
|
Wink Saville
|
b6636dab3a
|
am 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '812c2ff6312b25b9539399f38967f8a6ff40b733':
Add OEM specific USB mode enumeration based on ro.bootmode property
|
2012-02-10 15:17:12 -08:00 |
|
Wink Saville
|
e0043bf472
|
am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
|
2012-02-10 15:14:40 -08:00 |
|
Wink Saville
|
97c154c789
|
am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
|
2012-02-10 15:14:40 -08:00 |
|
Wink Saville
|
23051433d2
|
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
|
2012-02-10 15:12:19 -08:00 |
|
Eric Fischer
|
c2a5c6878d
|
am 8b6d7b06: am 650462bb: Import revised translations. DO NOT MERGE
* commit '8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
|
2012-02-10 13:13:58 -08:00 |
|
Eric Fischer
|
058b593289
|
am a2c92418: am 650462bb: Import revised translations. DO NOT MERGE
* commit 'a2c9241869c14a058621668d65ca29fc8a867bbf':
Import revised translations. DO NOT MERGE
|
2012-02-10 13:13:30 -08:00 |
|
Eric Fischer
|
e67927d80f
|
am 650462bb: Import revised translations. DO NOT MERGE
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
|
2012-02-10 13:11:46 -08:00 |
|
Eric Fischer
|
0686f4ec1b
|
am 650462bb: Import revised translations. DO NOT MERGE
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
|
2012-02-10 13:11:45 -08:00 |
|
Justin Ho
|
a01f83fe16
|
am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '0fc225ed37ec535ff9b5238f390a79dbaf7f377b':
|
2012-02-10 10:49:48 -08:00 |
|
Justin Ho
|
17aca35d84
|
am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
Import translations. DO NOT MERGE
|
2012-02-10 10:13:19 -08:00 |
|
Justin Ho
|
69e91bd287
|
am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
|
2012-02-10 10:10:39 -08:00 |
|
Justin Ho
|
f68eb20924
|
am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
|
2012-02-10 10:09:42 -08:00 |
|
Justin Ho
|
b96058b1fa
|
Merge "Import translations. DO NOT MERGE" into ics-mr1
|
2012-02-10 10:07:07 -08:00 |
|
Scott Main
|
809b41a84e
|
am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642
* commit '98c313340a46401adda86b398a7623f39aa8e412':
|
2012-02-09 21:07:10 -08:00 |
|
Joe Fernandez
|
94f6cc4d39
|
am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit 'a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
|
2012-02-09 21:07:08 -08:00 |
|
Scott Main
|
86cd9fa26a
|
am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit 'cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
|
2012-02-09 21:07:08 -08:00 |
|
Scott Main
|
68cda8cbaa
|
am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug 5125642
|
2012-02-09 16:04:15 -08:00 |
|
Scott Main
|
e1eb4ca887
|
am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug 5125642
|
2012-02-09 16:01:51 -08:00 |
|
Scott Main
|
8d35a8b077
|
am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug 5125642
|
2012-02-09 16:01:38 -08:00 |
|
Joe Fernandez
|
04398347b7
|
am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
|
2012-02-09 13:48:46 -08:00 |
|
Joe Fernandez
|
976238bf5c
|
am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
|
2012-02-09 13:46:55 -08:00 |
|
Joe Fernandez
|
c4c313f8ca
|
am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
|
2012-02-09 13:46:41 -08:00 |
|
Joe Fernandez
|
8ec61aacd3
|
Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
|
2012-02-09 13:45:01 -08:00 |
|
Scott Main
|
5cfc0b29db
|
am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
|
2012-02-09 12:50:18 -08:00 |
|
Scott Main
|
40818f11a9
|
am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
|
2012-02-09 12:48:18 -08:00 |
|
Scott Main
|
fbf4f0cf02
|
am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
|
2012-02-09 12:48:08 -08:00 |
|
Scott Main
|
abe3a692b0
|
am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':
|
2012-02-07 21:50:20 -08:00 |
|
Scott Main
|
8d2d215ec3
|
am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
* commit '8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
|
2012-02-07 21:49:37 -08:00 |
|
Scott Main
|
6301e33ebb
|
am 09ff04d7: docs: fix typo in menu TOC
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
|
2012-02-07 21:48:03 -08:00 |
|
Scott Main
|
aec806c78b
|
am 09ff04d7: docs: fix typo in menu TOC
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
|
2012-02-07 21:47:38 -08:00 |
|
The Android Open Source Project
|
652e8ffe13
|
am 1bd8111b: Reconcile with ics-mr1-release
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
|
2012-02-07 10:21:31 -08:00 |
|
The Android Open Source Project
|
9930f484d0
|
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
|
2012-02-07 10:18:32 -08:00 |
|
The Android Open Source Project
|
fe9a8650cc
|
am 07bebe8b: Reconcile with ics-mr1-release
* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
|
2012-02-07 10:11:11 -08:00 |
|
The Android Open Source Project
|
9fd89364ab
|
Reconcile with ics-mr1-release
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
|
2012-02-07 10:09:08 -08:00 |
|
John Wang
|
1dba562c36
|
am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
|
2012-02-06 17:04:42 -08:00 |
|
John Wang
|
35455a1f35
|
am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
|
2012-02-06 17:04:11 -08:00 |
|
John Wang
|
b4305fb3b2
|
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
|
2012-02-06 17:03:15 -08:00 |
|
John Wang
|
5e7679927c
|
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
|
2012-02-06 17:02:30 -08:00 |
|
John Wang
|
5245acf270
|
Merge "Don't use SNR in the invalid check." into ics-mr1
|
2012-02-06 17:00:49 -08:00 |
|
Xavier Ducrohet
|
b8c8ae7b70
|
am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '82fc005f579a20b3c7e63603f056ca095c288196':
|
2012-02-06 16:45:21 -08:00 |
|