Joe Fernandez
|
39c1418277
|
am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '6a9beb536f13c4df178cbe67c74c30d258bef28f':
|
2012-02-14 13:06:16 -08:00 |
|
Mike Lockwood
|
0a67a5f509
|
am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '5f423d88753e7c123527d4b7b940788eb2c94821':
|
2012-02-14 13:06:14 -08:00 |
|
John Wang
|
3cd75c2cc8
|
am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '749b32dfe6ece3ce6ced71d05351a1139d4a4cd4':
|
2012-02-14 13:06:11 -08:00 |
|
Joe Fernandez
|
189e00f454
|
am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '57f55d7f9cc1d194054020fcb4e6226579818e27':
docs: Android NDK r7b Release Notes
|
2012-02-14 12:42:44 -08:00 |
|
Mike Lockwood
|
c6398818df
|
am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'b9be8eff222d9b70079dd53d0d61de229d8d7914':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 12:42:42 -08:00 |
|
John Wang
|
44ff4eeafa
|
am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 12:42:40 -08:00 |
|
Joe Fernandez
|
b8c7b5e19b
|
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
|
2012-02-14 12:37:43 -08:00 |
|
Mike Lockwood
|
08082daf8c
|
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 12:37:40 -08:00 |
|
John Wang
|
fab67d1b13
|
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 12:37:38 -08:00 |
|
Joe Fernandez
|
e8c0c352bc
|
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
|
2012-02-14 12:37:18 -08:00 |
|
Mike Lockwood
|
14936f136c
|
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 12:37:16 -08:00 |
|
John Wang
|
74786c5669
|
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 12:37:14 -08:00 |
|
Joe Fernandez
|
a9c71f71e6
|
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
|
2012-02-14 12:05:25 -08:00 |
|
Mike Lockwood
|
51551a81ec
|
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1
|
2012-02-14 11:30:05 -08:00 |
|
John Wang
|
06ea772a19
|
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
|
2012-02-14 10:09:26 -08:00 |
|
Ramanan Rajeswaran
|
8bc199687c
|
Merge "DO NOT MERGE" into ics-scoop-plus-aosp
|
2012-02-14 07:35:13 -08:00 |
|
Jean-Baptiste Queru
|
3702fa58a1
|
am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit 'fca4ff3851508d9d2c414aa535a86d7ac0eb5e72':
Fix incorrect prototype for JNI call
|
2012-02-13 20:00:40 -08:00 |
|
Jean-Baptiste Queru
|
18fa07a8ff
|
am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
Fix incorrect prototype for JNI call
|
2012-02-13 19:58:09 -08:00 |
|
Jean-Baptiste Queru
|
d6f9c36d84
|
am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
Fix incorrect prototype for JNI call
|
2012-02-13 19:55:52 -08:00 |
|
Ramanan Rajeswaran
|
0055371169
|
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
|
2012-02-13 15:21:04 -08:00 |
|
Tsu Chiang Chuang
|
18c64569c8
|
am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':
|
2012-02-13 14:39:48 -08:00 |
|
Dianne Hackborn
|
ecfc127789
|
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
|
2012-02-13 14:39:45 -08:00 |
|
Jean-Baptiste Queru
|
5e9fd0734f
|
Merge "Fix incorrect prototype for JNI call"
|
2012-02-13 14:32:33 -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
|
22e1920a70
|
am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
|
2012-02-13 13:43:07 -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
|
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
|
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
|
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 |
|