Commit Graph

46243 Commits

Author SHA1 Message Date
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
Wu-cheng Li
0fba5eb1b4 Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren." 2012-02-29 22:49:10 -08:00
Jeff Brown
1ee4bf0224 Merge "Externalize more SQLite configuration options." 2012-02-29 21:29:22 -08:00
Mathias Agopian
cf56319d4d add more tracing for buffer allocation
Change-Id: I8408850d0625985992ef2e2cd0c9f300b1fca293
2012-02-29 20:47:20 -08:00
Irfan Sheriff
8c50c87015 Merge "Improve Wi-Fi hand-off" 2012-02-29 19:33:06 -08:00
Romain Guy
a451448053 Merge "Full implementation of Canvas.drawPath()" 2012-02-29 19:16:15 -08:00
Yu Shan Emily Lau
c0c8d789d9 am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'd12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:04:11 -08:00
Yu Shan Emily Lau
f756a1b32c am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '0ddfe24a19882bb355313b6c5c14dcb0c6608365':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:03:40 -08:00
Yu Shan Emily Lau
c26ce0c14a am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:00:08 -08:00
Yu Shan Emily Lau
f5d9e573b7 am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:00:00 -08:00
Fabrice Di Meglio
c962e16f39 Merge "Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated" 2012-02-29 18:45:54 -08:00
Gilles Debunne
195fcb043e Merge "Invalidate text display list on scroll" 2012-02-29 17:32:20 -08:00
Michael Jurka
e40995e40a Merge "Fix alpha when swiping recents on tablets" 2012-02-29 17:30:05 -08:00
Jeff Brown
3b6972e89b Merge "Don't throw if sqlite3_finalize returns an error." 2012-02-29 17:06:23 -08:00
Jeff Brown
2ee9104216 Merge "Refactor SQLiteOpenHelper." 2012-02-29 17:06:08 -08:00
Andrew Hsieh
5b06718071 Merge "Fixed several 64-bit porting issues" 2012-02-29 16:41:55 -08:00
James Dong
0ae12e7604 Merge "Added permission check for all sensitive drm API calls" 2012-02-29 16:32:10 -08:00
Fabrice Di Meglio
643af24b80 Merge "Fix bug #5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed" 2012-02-29 16:20:24 -08:00
Jean-Baptiste Queru
a5118ea50b am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '964955e0bd98166c16f705811ce46d0151924cc8':
  DRM framwork bug fix: add an API to release resources
2012-02-29 15:51:30 -08:00
Jean-Baptiste Queru
dd5d00f854 am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '93920d79b7fa57ad941f5dbf33cf15ead6cd7318':
  Set width of spinner's dropdown to fit on device
2012-02-29 15:51:28 -08:00
Jean-Baptiste Queru
965306a3df am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit 'c69d61343913848b467022ef63f2c84cbc5ec34b':
  Adds documentation for ContentResolver notifyChange()
2012-02-29 15:51:25 -08:00
Jean-Baptiste Queru
34f184af06 am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '4f9063622415ea083bbd639af06e98065ce7176d':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 15:51:23 -08:00
Jean-Baptiste Queru
d49960f16b am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
  stagefright aacenc: Safeguard against overwriting bits
2012-02-29 15:51:19 -08:00
Jean-Baptiste Queru
26c9ac4bd1 am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '8a9b14d80530eccf801fa794bacf287813b5978f':
  DRM framwork bug fix: add an API to release resources
2012-02-29 15:47:45 -08:00
Jean-Baptiste Queru
7052bf3fca am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit 'a66be970999c5eec1c8efb46e196f19ae563fc9b':
  Set width of spinner's dropdown to fit on device
2012-02-29 15:47:42 -08:00
Jean-Baptiste Queru
005ec1bd8f am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
  Adds documentation for ContentResolver notifyChange()
2012-02-29 15:47:38 -08:00
Jean-Baptiste Queru
c284057bd4 am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 15:47:35 -08:00
Jean-Baptiste Queru
6a0321714b am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits
2012-02-29 15:47:32 -08:00
Jean-Baptiste Queru
ec5b77b8cc am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '5aeb85877a95cc12c0784757a9842983b04e8600':
  DRM framwork bug fix: add an API to release resources
2012-02-29 15:44:41 -08:00
Jean-Baptiste Queru
1674e9d2ad am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '11aa4cc38b646f62eb22842d7510415b61c2ef84':
  Set width of spinner's dropdown to fit on device
2012-02-29 15:44:38 -08:00
Jean-Baptiste Queru
2a54535c51 am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '9303919d7d837dedf16f09ace0013e62670568e7':
  Adds documentation for ContentResolver notifyChange()
2012-02-29 15:44:34 -08:00