drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,181 Commits 1 Branch 0 Tags
Commit Graph

63181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ramanan Rajeswaran
352b8d03c6 am 8046e294: Merge "DO NOT MERGE" into ics-scoop 
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE
 2012-02-13 14:24:38 -08:00
Ramanan Rajeswaran
8046e294c5 Merge "DO NOT MERGE" into ics-scoop 2012-02-13 14:22:44 -08:00
Ramanan Rajeswaran
9d29031417 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
5f5ea91f60 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
eb56ad183a 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
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Dianne Hackborn
d1f88de2c4 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
c1496d2d9a Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 12:01:56 -08:00
Wink Saville
5caed1d99b 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
e8b57feaab 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
f11b6fbfc8 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
812c2ff631 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
197fe26940 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
5b6f9bf51c am 8b6d7b06: am 650462bb: Import revised translations. DO NOT MERGE 
* commit '8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
 2012-02-10 13:13:58 -08:00
Eric Fischer
ffb2473b3b 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
a2c9241869 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
8b6d7b063b am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:45 -08:00
Eric Fischer
650462bbfd Import revised translations. DO NOT MERGE 
Change-Id: Ibfc588d17f79baa0359d3a20a0a5ff7a2f3f152b
 2012-02-10 12:29:26 -08:00
Kazuhiro Ondo
afd8f1820e Add OEM specific USB mode enumeration based on ro.bootmode property 
This patch is adding a capability so that OEM can override USB mode
in case the device is boot up with OEM specific mode. (i.e. modem
debug, factory test etc.)

Bug:5964042
Change-Id: Ic8e23d302563ce71eedb74ce94cca8c65838a4f7
 2012-02-10 12:29:12 -08:00
Justin Ho
25d1d268c1 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
f994f353f7 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
0fc225ed37 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
448249d1a7 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
744c5b0bde Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -08:00
Scott Main
b45087bf09 am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit '98c313340a46401adda86b398a7623f39aa8e412':
 2012-02-09 21:07:10 -08:00
Joe Fernandez
d2deae8f40 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
758fe1511e 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
ad231a303e 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
db7da7ee40 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
98c313340a am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:38 -08:00
Scott Main
d9c8bbd56a docs: fix xss issue 
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
 2012-02-09 15:57:09 -08:00
Joe Fernandez
4f21e3a08a 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
a300ea98df 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
20b9c795d4 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
1c66faab73 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
ec12ae9933 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
cf18f42026 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
79cfde69fd 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
52bfc24368 docs: fix misc doc bugs from external issue tracker 
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
 2012-02-09 12:45:16 -08:00
Joe Fernandez
a61f842040 docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132) 
Change-Id: I9d504017c507b2e203b8e0448d720714bec32e8c
 2012-02-09 11:16:20 -08:00
Eric Fischer
e42fe553a7 Import translations. DO NOT MERGE 
Change-Id: Id6eb7d951bbbd8d01ce11670946282eecd7bc984
 2012-02-08 18:46:47 -08:00
Scott Main
cc9dd9a637 am 02beef84: am 09ff04d7: docs: fix typo in menu TOC 
* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':
 2012-02-07 21:50:20 -08:00
Scott Main
f8274e506c 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
02beef8445 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
8561a6b0c5 am 09ff04d7: docs: fix typo in menu TOC 
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC
 2012-02-07 21:47:38 -08:00
Scott Main
09ff04d789 docs: fix typo in menu TOC 
Change-Id: Ief511803ef5b4bed1823a12918de814aca119681
 2012-02-07 21:45:00 -08:00
The Android Open Source Project
6668958cbe am 1bd8111b: Reconcile with ics-mr1-release 
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
 2012-02-07 10:21:31 -08:00
The Android Open Source Project
1bd8111bbc Reconcile with ics-mr1-release 
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
 2012-02-07 10:18:32 -08:00
The Android Open Source Project
0138357198 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
07bebe8b12 Reconcile with ics-mr1-release 
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
 2012-02-07 10:09:08 -08:00