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 |
|
Jean-Baptiste Queru
|
82c3852fd5
|
am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
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:44:31 -08:00 |
|
Jean-Baptiste Queru
|
c9b107f365
|
am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
|
2012-02-29 15:44:28 -08:00 |
|
Jean-Baptiste Queru
|
c31e9aa9cf
|
Merge "DRM framwork bug fix: add an API to release resources"
|
2012-02-29 15:12:48 -08:00 |
|
Jean-Baptiste Queru
|
d02344babf
|
Merge "Set width of spinner's dropdown to fit on device"
|
2012-02-29 15:09:17 -08:00 |
|
Glenn Kasten
|
67f8b5228e
|
Merge "Shorten thread names"
|
2012-02-29 14:59:08 -08:00 |
|
Glenn Kasten
|
47e864ebe6
|
Merge "Prepare for threadLoop merge - active tracks"
|
2012-02-29 14:56:30 -08:00 |
|
Glenn Kasten
|
7d4ecebdeb
|
Merge "AudioRecord const methods"
|
2012-02-29 14:45:25 -08:00 |
|
Glenn Kasten
|
b75a7e6e26
|
Merge "Update AudioFlinger comments"
|
2012-02-29 14:44:39 -08:00 |
|
Glenn Kasten
|
053a6b09dc
|
Merge "Pull in declaration of effectChains to inner block"
|
2012-02-29 14:43:19 -08:00 |
|
Jean-Baptiste Queru
|
1f26fe2497
|
Merge "Adds documentation for ContentResolver notifyChange()"
|
2012-02-29 14:38:59 -08:00 |
|
Adam Powell
|
91fe608f1c
|
Merge "Fix simple_list_item_multiple_choice to use correct size and spacing."
|
2012-02-29 14:26:24 -08:00 |
|
Jean-Baptiste Queru
|
35d19b4773
|
Merge changes I46c81dba,If1f40e9c,I652eaaa5
* changes:
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 14:24:52 -08:00 |
|
Jean-Baptiste Queru
|
f49cfe3daa
|
Merge "stagefright aacenc: Safeguard against overwriting bits"
|
2012-02-29 14:23:38 -08:00 |
|
Christopher Tate
|
5090d0c4f4
|
Merge "Merge: Introduce UpdateLocks"
|
2012-02-29 14:08:46 -08:00 |
|
Svetoslav Ganov
|
e2c15c2520
|
Merge "Update to allow passing empty string in a binding."
|
2012-02-29 14:08:13 -08:00 |
|
Jake Hamby
|
74e4f5c7ee
|
Merge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready."
|
2012-02-29 14:04:48 -08:00 |
|
Eric Fischer
|
1d58e77773
|
am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
* commit 'd31da0a670a60722339faa18e1147adb9c14532d':
|
2012-02-29 13:30:51 -08:00 |
|