Commit Graph

46373 Commits

Author SHA1 Message Date
The Android Open Source Project
1b25fd9ea2 am efa49439: am 4f306bec: Reconcile with ics-mr1-release
* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':
2012-03-01 16:46:44 -08:00
Jeff Brown
cf274215e1 Merge "Shouldn't catch Throwable in AsyncTask." 2012-03-01 16:43:41 -08:00
Irfan Sheriff
ee48a84775 Merge "Fix WifiManager async API" 2012-03-01 16:26:52 -08:00
Adam Powell
1ef7b6ead9 Merge "Fix dividers for LinearLayout (TabWidget)" 2012-03-01 16:26:04 -08:00
Fabrice Di Meglio
e23b4521ee Merge "Make layoutDirection API public" 2012-03-01 16:23:29 -08:00
Brian Carlstrom
9011600b21 Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)" 2012-03-01 16:22:13 -08:00
Teng-Hui Zhu
715f6e8a65 Merge "Allow webview to delete GL resource in a valid EGL context" 2012-03-01 16:04:18 -08:00
The Android Open Source Project
4d811ec616 am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release
* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':
2012-03-01 15:51:34 -08:00
Andreas Huber
66b4557b7e Merge "Remove hacks that worked around issues in OMX components several releases back." 2012-03-01 15:46:19 -08:00
Android Git Automerger
0921733b1a am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':
2012-03-01 15:35:49 -08:00
Yu Shan Emily Lau
2013c379ab am da0c4a3e: am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'da0c4a3ea653a866d6a8fe00bc52f27d0841874b':
2012-03-01 15:35:47 -08:00
Yu Shan Emily Lau
5d2ae34573 am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '353b61a87d9eb0ee223bdda76c30a1364441d962':
  Set the video encoding bit rate for the media recorder stress test.
2012-03-01 15:35:43 -08:00
Jean-Baptiste Queru
c8a2180afa am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7':
  DRM framwork bug fix: add an API to release resources
2012-03-01 15:35:39 -08:00
Jean-Baptiste Queru
24d4e44579 am f09c0c7f: am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit 'f09c0c7f31e72611d91b4ac91ce5a9f019b16083':
  Set width of spinner's dropdown to fit on device
2012-03-01 15:35:37 -08:00
Jean-Baptiste Queru
88498d60fd am dbc591e2: am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit 'dbc591e27686486c732fca2f94fde645e3487b7a':
  Adds documentation for ContentResolver notifyChange()
2012-03-01 15:35:33 -08:00
Jean-Baptiste Queru
c41fbc3ccf am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '9de7793b425be89889412f3a86466d7b19055c3c':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
2012-03-01 15:35:25 -08:00
Jean-Baptiste Queru
d90b9b8164 am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
  stagefright aacenc: Safeguard against overwriting bits
2012-03-01 15:35:23 -08:00
Eric Fischer
16782f6625 am 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
* commit '4917bc104da1725d7ba093713de3802dec1515e5':
2012-03-01 15:32:24 -08:00
Eric Fischer
4d608d7525 am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not translatable.
* commit 'b145e363ff4e00048cdc9035300a6db05aa0fbb5':
  Mark configuration strings as not translatable.
2012-03-01 15:32:22 -08:00
Jim Miller
d712843b84 Merge "Fix 5797764: fix crash on tablets" 2012-03-01 15:01:53 -08:00
Jim Miller
8a5da14425 Merge "Fix 5797764: don't hold PowerManager lock when changing native brightness" 2012-03-01 14:30:21 -08:00
Steve Block
768f8c4320 Merge "Prevent a 'TODO' from appearing in the JavaDoc" 2012-03-01 14:21:25 -08:00
Robert Ly
a278f4642a am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1
* commit '3c78e101ec3ad427bf0341e3134659346fa06cc0':
2012-03-01 14:15:03 -08:00
Robert Ly
ffb9866bd3 am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1
* commit 'd70eaff41ce4e033656eeebb5eb7153b49d2ac5a':
  fix bug 5942522
2012-03-01 14:13:15 -08:00
Robert Ly
b11d85180c am 941ff38d: Merge "fix bug 5942522" into ics-mr1
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
2012-03-01 14:11:05 -08:00
Robert Ly
2723562129 am 941ff38d: Merge "fix bug 5942522" into ics-mr1
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
2012-03-01 14:10:46 -08:00
Robert Ly
55383fdaa7 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
47af9e48dc am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
* commit '9d36dcc0f29d7afc7656d9320dd3a5edfb980989':
2012-03-01 12:48:42 -08:00
Robert Ly
2b53ed68c6 am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
* commit '8125b0b4343b7f480196ce73103ca00cdf64f9e5':
  docs: fix bug 5878445
2012-03-01 12:47:44 -08:00
Robert Ly
88e35b82c0 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
2012-03-01 12:44:36 -08:00
Robert Ly
84b448849b am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
2012-03-01 12:44:35 -08:00
Robert Ly
671c6de30c Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
Andreas Huber
6bb241d177 Merge "Instead of hardcoding OMX component names in our code, support" 2012-03-01 12:41:10 -08:00
Romain Guy
4a67f0b2d3 Merge "Small tweak to Canvas.drawPath() GL implementation" 2012-03-01 12:11:59 -08:00
Teng-Hui Zhu
0c438b9a1b Merge "Clean up Surface Texture on Java side" 2012-03-01 11:32:59 -08:00
Andreas Huber
bc48ce68e6 Instead of hardcoding OMX component names in our code, support
a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
2012-03-01 11:30:10 -08:00
John Wang
7ef496f24b Merge "[maguro] Add Cheers' MCCMNC in SIMRecords.java" 2012-03-01 10:52:47 -08:00
The Android Open Source Project
08ae791d78 am 4f306bec: Reconcile with ics-mr1-release
* commit '4f306becef17ea986522202cc8c90b0e32e2ded1':
2012-03-01 10:46:52 -08:00
The Android Open Source Project
8f1a37dd23 Reconcile with ics-mr1-release
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
2012-03-01 10:40:13 -08:00
Wink Saville
7627b0869c Merge "If no NITZ information use Country Code to set TimeZone." 2012-03-01 10:28:56 -08:00
Jeff Brown
61d848eb15 Merge "Improve documentation of SQLite debugging options." 2012-03-01 10:23:51 -08:00
Eric Laurent
c189c9deb7 Merge "renamed audio policy output flag." 2012-03-01 10:17:21 -08:00
The Android Open Source Project
7914288aa5 am f8e58c8b: Reconcile with ics-mr1-release
* commit 'f8e58c8b4e8e2ef84e7213401ab595ce084f5612':
2012-03-01 10:14:27 -08:00
The Android Open Source Project
9407583c70 Reconcile with ics-mr1-release
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
2012-03-01 10:11:48 -08:00
Alex Sakhartchouk
f82a2a4cc5 Merge "Allocation sampling api prototypes." 2012-03-01 09:43:43 -08:00
Roman Nurik
4e7d2ed36c am 62b4e4a8: am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '62b4e4a83ea949537ca4bb1f56074d63a17bf87a':
2012-03-01 09:26:24 -08:00
Roman Nurik
7be71a8806 am b96ad49a: am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit 'b96ad49a3a898b741f7c4d6854e599116546e2ac':
  docs: Android Design downloads section, linkable H2s.
2012-03-01 09:08:33 -08:00
Robert Greenwalt
3f7d921b3d Merge "Don't forget to turn off mobile_dun" 2012-03-01 08:13:24 -08:00
Android Git Automerger
c62b77e486 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-01 07:35:22 -08:00
satok
70cf16eded Merge "Handle sentence level spell checking hidden APIs" 2012-03-01 00:25:03 -08:00