OSDN Git Service
Romain Guy [Mon, 12 Dec 2011 21:37:45 +0000 (13:37 -0800)]
am
6752d0ab: Mark color uniform fetched after fetching it
* commit '
6752d0ab029a185a42e34e7a933b669e6ed19e89':
Mark color uniform fetched after fetching it
Romain Guy [Mon, 12 Dec 2011 21:37:42 +0000 (13:37 -0800)]
am
11326aa1: Merge "Code cleanup"
* commit '
11326aa1b9482fefa0c0bdcb7e48cfeae6f9e33d':
Code cleanup
Romain Guy [Mon, 12 Dec 2011 21:37:39 +0000 (13:37 -0800)]
am
ee698a01: Merge "Free up resources by deleting shaders early on"
* commit '
ee698a01bdc9ea7aa2b1cd729109b194a130f9f5':
Free up resources by deleting shaders early on
Romain Guy [Mon, 12 Dec 2011 19:44:43 +0000 (11:44 -0800)]
Merge "Code cleanup"
Romain Guy [Mon, 12 Dec 2011 19:44:32 +0000 (11:44 -0800)]
Merge "Free up resources by deleting shaders early on"
Amith Yamasani [Mon, 12 Dec 2011 17:57:42 +0000 (09:57 -0800)]
am
549d5f88: Merge "Show the current stream\'s volume in the volume panel."
* commit '
549d5f88bf96f93de5d10f094bda4a62ac5ebe3a':
Show the current stream's volume in the volume panel.
Amith Yamasani [Mon, 12 Dec 2011 17:56:26 +0000 (09:56 -0800)]
Merge "Show the current stream's volume in the volume panel."
Andreas Huber [Mon, 12 Dec 2011 16:33:48 +0000 (08:33 -0800)]
am
2fc93533: Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
* commit '
2fc93533d2689d510c93931bc02ad602fa0e46f2':
Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler
Andreas Huber [Mon, 12 Dec 2011 16:32:28 +0000 (08:32 -0800)]
Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
Ben Murdoch [Mon, 12 Dec 2011 11:24:34 +0000 (03:24 -0800)]
am
2ff8cc24: Merge "Clear the WebView picture when a new load starts."
* commit '
2ff8cc2438866f791d8fe888573b5fba103e2cd0':
Clear the WebView picture when a new load starts.
Ben Murdoch [Mon, 12 Dec 2011 11:13:46 +0000 (03:13 -0800)]
Merge "Clear the WebView picture when a new load starts."
Owen Lin [Mon, 12 Dec 2011 08:22:07 +0000 (00:22 -0800)]
am
130f62ab: Fix the build. (Change LOGV to ALOGV)
* commit '
130f62ab014ad95e6dc03ff219a581c8b93c82e4':
Fix the build. (Change LOGV to ALOGV)
Makoto Onuki [Sat, 10 Dec 2011 21:25:38 +0000 (13:25 -0800)]
am
95ea6d6d: Merge "MCC detection fixes for CountryDetector"
* commit '
95ea6d6d5d56a7e9e533abe2837ed2379c4271e1':
MCC detection fixes for CountryDetector
Makoto Onuki [Sat, 10 Dec 2011 21:23:59 +0000 (13:23 -0800)]
Merge "MCC detection fixes for CountryDetector"
Andreas Huber [Sat, 10 Dec 2011 02:11:46 +0000 (18:11 -0800)]
am
1f7817e1: am
ebfce84f: am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
1f7817e1461f4af304d60cc3849d532288e4d2de':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Sat, 10 Dec 2011 02:11:44 +0000 (18:11 -0800)]
am
61a8b530: am
aa82c39b: am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
61a8b5301b9cf3abef9f1b9fa5af55912cb9d9c7':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Svetoslav Ganov [Sat, 10 Dec 2011 02:11:43 +0000 (18:11 -0800)]
am
47730f15: am
33a3b2ce: am
48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
* commit '
47730f1582dfa67909293d6d5b88ff89c5ad6ed5':
NumberPicker getting stuck if scroll wheel not wrapable.
Irfan Sheriff [Sat, 10 Dec 2011 02:11:41 +0000 (18:11 -0800)]
am
ecd7798c: am
a3c7c358: am
583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
* commit '
ecd7798ce45f9c8f1901c9348ad5452e0bc88a95':
Handle emergency call back mode correctly
Gilles Debunne [Sat, 10 Dec 2011 02:11:39 +0000 (18:11 -0800)]
am
70511ade: am
b25d417f: am
aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
* commit '
70511ade47f75160bdfbf0693145a4b827294136':
Make the Next key navigate between TextViews
Gilles Debunne [Sat, 10 Dec 2011 02:09:36 +0000 (18:09 -0800)]
am
2afcfa42: resolved conflicts for merge of
5371a165 to master
* commit '
2afcfa42392996525c6a995b354b241f22429959':
Limit created string size in Spell Checker
Andreas Huber [Sat, 10 Dec 2011 02:09:21 +0000 (18:09 -0800)]
am
ebfce84f: am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Sat, 10 Dec 2011 02:09:19 +0000 (18:09 -0800)]
am
aa82c39b: am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Svetoslav Ganov [Sat, 10 Dec 2011 02:09:16 +0000 (18:09 -0800)]
am
33a3b2ce: am
48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
* commit '
33a3b2cecf174cb14097498214131fcfb32ec04c':
NumberPicker getting stuck if scroll wheel not wrapable.
Irfan Sheriff [Sat, 10 Dec 2011 02:09:07 +0000 (18:09 -0800)]
am
a3c7c358: am
583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
* commit '
a3c7c35873235486787d58fa8310eebd87508bc9':
Handle emergency call back mode correctly
Gilles Debunne [Sat, 10 Dec 2011 02:09:03 +0000 (18:09 -0800)]
am
b25d417f: am
aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
* commit '
b25d417fce0e0467187ac187a4dabae75d5dc83d':
Make the Next key navigate between TextViews
Gilles Debunne [Sat, 10 Dec 2011 02:06:34 +0000 (18:06 -0800)]
resolved conflicts for merge of
5371a165 to master
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
Claudia de Veaux [Sat, 10 Dec 2011 00:43:42 +0000 (16:43 -0800)]
am
f3aa0f78: Merge "Edit to string to change "double-touch" to "double-tap" per standard language."
* commit '
f3aa0f78fffeca0dd7b632262def3c78ff7e0e7c':
Edit to string to change "double-touch" to "double-tap" per standard language.
Claudia de Veaux [Sat, 10 Dec 2011 00:42:11 +0000 (16:42 -0800)]
Merge "Edit to string to change "double-touch" to "double-tap" per standard language."
Steven Ross [Sat, 10 Dec 2011 00:31:22 +0000 (16:31 -0800)]
am
e4067fac: Merge "Checking whether screen is on in constructor fixes
5658742"
* commit '
e4067faca93ee1669c7b68d5e767317c0bbad9c1':
Checking whether screen is on in constructor fixes
5658742
Steven Ross [Sat, 10 Dec 2011 00:28:39 +0000 (16:28 -0800)]
Merge "Checking whether screen is on in constructor fixes
5658742"
Irfan Sheriff [Fri, 9 Dec 2011 23:23:51 +0000 (15:23 -0800)]
am
c4ea8dfd: Remove explicit network disabling code
* commit '
c4ea8dfd46a5eeeedd15664a6499ecde32985509':
Remove explicit network disabling code
Eric Fischer [Fri, 9 Dec 2011 23:03:51 +0000 (15:03 -0800)]
am
049bc558: am
8430094c: (-s ours) am
ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
049bc558b3c0dc437dbc67d827318135a772850d':
Import revised translations. DO NOT MERGE
The Android Open Source Project [Fri, 9 Dec 2011 23:03:49 +0000 (15:03 -0800)]
The Android Open Source Project [Fri, 9 Dec 2011 23:03:47 +0000 (15:03 -0800)]
am
e2d4301f: am
54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '
e2d4301f7119fc21ba5e867d9793cd73e089264b':
More fixing for issue #
5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Eric Fischer [Fri, 9 Dec 2011 22:58:10 +0000 (14:58 -0800)]
am
8430094c: (-s ours) am
ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
8430094cd9ecfcb932014ed5ae2d3db095bc7382':
Import revised translations. DO NOT MERGE
The Android Open Source Project [Fri, 9 Dec 2011 22:58:07 +0000 (14:58 -0800)]
The Android Open Source Project [Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)]
am
54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '
54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #
5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Nick Pelly [Fri, 9 Dec 2011 22:38:10 +0000 (14:38 -0800)]
am
1db7a31a: Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"
* commit '
1db7a31a45c234eb18bd788264591859bee64815':
Add BluetoothAdapter.getRemoteDevice(byte[])
Nick Pelly [Fri, 9 Dec 2011 22:38:08 +0000 (14:38 -0800)]
am
8c9d0139: Merge "Fix BasicNfcEeTest java package."
* commit '
8c9d01391cd257dce65928b462b32df24eb38b82':
Fix BasicNfcEeTest java package.
Nick Pelly [Fri, 9 Dec 2011 22:37:05 +0000 (14:37 -0800)]
Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"
Nick Pelly [Fri, 9 Dec 2011 22:36:23 +0000 (14:36 -0800)]
Merge "Fix BasicNfcEeTest java package."
Gilles Debunne [Fri, 9 Dec 2011 22:28:40 +0000 (14:28 -0800)]
am
683a485f: am
aee940df: am
a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit '
683a485fbcf72caad42f9fd030255f1083ce5637':
IOOB is Suggestions
Gilles Debunne [Fri, 9 Dec 2011 22:28:38 +0000 (14:28 -0800)]
am
47a4b78e: am
9f4b70c7: am
89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '
47a4b78eb7c662cc12c68690ff57b4004c39980c':
Prevent NPE in SuggestionSpan
Jeff Tinker [Fri, 9 Dec 2011 22:28:36 +0000 (14:28 -0800)]
am
aac2f9c6: am
a5038d16: am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
aac2f9c66ccb181544f822a1af7397a8e25455e7':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Brown [Fri, 9 Dec 2011 22:28:34 +0000 (14:28 -0800)]
am
bdc18b28: am
03e63427: am
8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '
bdc18b28eb04b8c8cc00313096f8bfb142e407e3':
Shortcut keys should be handled on down, not up.
Jeff Brown [Fri, 9 Dec 2011 22:28:32 +0000 (14:28 -0800)]
am
fa7fa9a5: am
944c985b: am
e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit '
fa7fa9a5ba796eabb2dadb8e2ce1b97da38e939e':
Fix system hotkey handling.
Gilles Debunne [Fri, 9 Dec 2011 22:25:55 +0000 (14:25 -0800)]
am
aee940df: am
a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit '
aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
IOOB is Suggestions
Gilles Debunne [Fri, 9 Dec 2011 22:25:53 +0000 (14:25 -0800)]
am
9f4b70c7: am
89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '
9f4b70c72508077f39a71bb17df265eb883c7a20':
Prevent NPE in SuggestionSpan
Jeff Tinker [Fri, 9 Dec 2011 22:25:49 +0000 (14:25 -0800)]
am
a5038d16: am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Brown [Fri, 9 Dec 2011 22:25:41 +0000 (14:25 -0800)]
am
03e63427: am
8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '
03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.
Jeff Brown [Fri, 9 Dec 2011 22:25:38 +0000 (14:25 -0800)]
am
944c985b: am
e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit '
944c985b4199e6e029568ea87004c9727e469cc0':
Fix system hotkey handling.
Jack Palevich [Fri, 9 Dec 2011 22:21:22 +0000 (14:21 -0800)]
am
ec3a88de: Merge "Fix convert8To4, convert8To5"
* commit '
ec3a88dee2c7d77c09eaad0c297f077744033d48':
Fix convert8To4, convert8To5
Jack Palevich [Fri, 9 Dec 2011 22:19:39 +0000 (14:19 -0800)]
Merge "Fix convert8To4, convert8To5"
Jack Palevich [Fri, 9 Dec 2011 22:06:07 +0000 (14:06 -0800)]
Fix convert8To4, convert8To5
See b/
5680952 "Compilation warnings in etc1.cpp" for discussion.
Fixes b/
5680952
Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
Irfan Sheriff [Fri, 9 Dec 2011 20:45:16 +0000 (12:45 -0800)]
am
1108e8dd: Merge "Change RSSI notification levels to 5 in framework"
* commit '
1108e8ddad3ddf0dbc660229ca3be6de7f600c3a':
Change RSSI notification levels to 5 in framework
Irfan Sheriff [Fri, 9 Dec 2011 20:43:28 +0000 (12:43 -0800)]
Merge "Change RSSI notification levels to 5 in framework"
Alex Sakhartchouk [Fri, 9 Dec 2011 20:40:31 +0000 (12:40 -0800)]
Merge "Renaming some classes to clarify what is what." into graphics-dev
Romain Guy [Fri, 9 Dec 2011 20:31:05 +0000 (12:31 -0800)]
am
3f7be830: Merge "Enable dirty regions on newly created EGL surfaces"
* commit '
3f7be830f053265699f3b8cb18d709f84aa5d546':
Enable dirty regions on newly created EGL surfaces
Romain Guy [Fri, 9 Dec 2011 20:28:46 +0000 (12:28 -0800)]
Merge "Enable dirty regions on newly created EGL surfaces"
Kristian Monsen [Fri, 9 Dec 2011 19:01:19 +0000 (11:01 -0800)]
am
5aa2136d: Merge "Update string lengths, fix for bug
5732776"
* commit '
5aa2136ddfcccab853381316b1940efb1eb6679c':
Update string lengths, fix for bug
5732776
Alex Sakhartchouk [Fri, 9 Dec 2011 19:01:16 +0000 (11:01 -0800)]
am
f8c1f1c1: Merge "Making UI a bit more responsive."
* commit '
f8c1f1c17c4909e321f23a9cd603d4410cd03ce0':
Making UI a bit more responsive.
Narayan Kamath [Fri, 9 Dec 2011 19:00:55 +0000 (11:00 -0800)]
am
e61fd281: Merge "Remove BlockingMediaPlayer."
* commit '
e61fd281a8cb69ae45c5de4b160ab86226083152':
Remove BlockingMediaPlayer.
Romain Guy [Fri, 9 Dec 2011 19:00:34 +0000 (11:00 -0800)]
am
d3209c1b: Merge "GenerationCache::get would return a random value instead of NULL Bug #
5401917"
* commit '
d3209c1bb21ce026d4e41464740e3d8f57cdd56f':
GenerationCache::get would return a random value instead of NULL Bug #
5401917
Mangesh Ghiware [Fri, 9 Dec 2011 19:00:32 +0000 (11:00 -0800)]
am
66b2ff81: Update computation of reading level scale.
* commit '
66b2ff818bdc58465e54d7fc42772857c07fa262':
Update computation of reading level scale.
Kristian Monsen [Fri, 9 Dec 2011 18:12:41 +0000 (10:12 -0800)]
Merge "Update string lengths, fix for bug
5732776"
Alex Sakhartchouk [Fri, 9 Dec 2011 18:04:27 +0000 (10:04 -0800)]
Merge "Making UI a bit more responsive."
Narayan Kamath [Fri, 9 Dec 2011 14:30:14 +0000 (06:30 -0800)]
Merge "Remove BlockingMediaPlayer."
Romain Guy [Fri, 9 Dec 2011 02:51:03 +0000 (18:51 -0800)]
Merge "GenerationCache::get would return a random value instead of NULL Bug #
5401917"
Romain Guy [Fri, 9 Dec 2011 02:19:39 +0000 (18:19 -0800)]
GenerationCache::get would return a random value instead of NULL
Bug #
5401917
This was causing a ton of random crashes in apps.
Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
Alex Sakhartchouk [Fri, 9 Dec 2011 01:55:09 +0000 (17:55 -0800)]
Merge "Sample scene graph" into graphics-dev
Fabrice Di Meglio [Thu, 8 Dec 2011 23:44:56 +0000 (15:44 -0800)]
am
63b06804: Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ"
* commit '
63b068040f5b8f561ae9d0b9b24bb405156d7029':
Clean TextLayout code and remove RTL_USE_HARFBUZZ
Fabrice Di Meglio [Thu, 8 Dec 2011 23:42:28 +0000 (15:42 -0800)]
Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ"
Andreas Huber [Thu, 8 Dec 2011 21:35:53 +0000 (13:35 -0800)]
am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Thu, 8 Dec 2011 21:35:51 +0000 (13:35 -0800)]
am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:06 +0000 (13:33 -0800)]
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
Svetoslav Ganov [Thu, 8 Dec 2011 20:30:14 +0000 (12:30 -0800)]
am
48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
* commit '
48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
NumberPicker getting stuck if scroll wheel not wrapable.
Svetoslav Ganov [Thu, 8 Dec 2011 20:28:11 +0000 (12:28 -0800)]
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 20:23:03 +0000 (12:23 -0800)]
am
583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
* commit '
583fdf0068ac46fb384a5aa2b193faf743f8221c':
Handle emergency call back mode correctly
Irfan Sheriff [Thu, 8 Dec 2011 20:21:20 +0000 (12:21 -0800)]
Merge "Handle emergency call back mode correctly" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:58:33 +0000 (11:58 -0800)]
am
aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
* commit '
aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
Make the Next key navigate between TextViews
Gilles Debunne [Thu, 8 Dec 2011 19:58:31 +0000 (11:58 -0800)]
am
0e7b8020: Merge "Limit created string size in Spell Checker" into ics-mr1
* commit '
0e7b8020fd8607957844f7d67e8aaa6dc2ef816f':
Limit created string size in Spell Checker
Gilles Debunne [Thu, 8 Dec 2011 19:57:06 +0000 (11:57 -0800)]
Merge "Make the Next key navigate between TextViews" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:56:28 +0000 (11:56 -0800)]
Merge "Limit created string size in Spell Checker" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 19:11:06 +0000 (11:11 -0800)]
am
ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
ab6b816a76c77f1ecd9a0ae911026aaba062f6d1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Dec 2011 19:09:11 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Thu, 8 Dec 2011 18:29:04 +0000 (10:29 -0800)]
am
641a5624: Reconcile with ics-mr0-release
* commit '
641a5624075ee942b85b17646b57f65377567a06':
The Android Open Source Project [Thu, 8 Dec 2011 18:26:33 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
The Android Open Source Project [Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
Gilles Debunne [Thu, 8 Dec 2011 18:01:29 +0000 (10:01 -0800)]
am
a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit '
a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
IOOB is Suggestions
Gilles Debunne [Thu, 8 Dec 2011 18:01:27 +0000 (10:01 -0800)]
am
89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '
89f2e8a099c32cdbb8409482fe91dabea5a7673e':
Prevent NPE in SuggestionSpan
Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]
Merge "IOOB is Suggestions" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
Kenny Root [Thu, 8 Dec 2011 17:04:27 +0000 (09:04 -0800)]
am
c2fc52dc: Merge "Add aapt support for implicitly-granted permissions"
* commit '
c2fc52dc9ce8728bcd1c2b4d82ee573fa7f5049b':
Add aapt support for implicitly-granted permissions
Kenny Root [Thu, 8 Dec 2011 17:02:51 +0000 (09:02 -0800)]
Merge "Add aapt support for implicitly-granted permissions"
The Android Automerger [Thu, 8 Dec 2011 15:00:35 +0000 (07:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:16:22 +0000 (00:16 -0800)]
am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:31:03 +0000 (23:31 -0800)]
am
8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '
8e0ecbfc97606ea30d0d8216fea635888f766b9d':
Shortcut keys should be handled on down, not up.
Jeff Brown [Thu, 8 Dec 2011 07:31:02 +0000 (23:31 -0800)]
am
e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit '
e0e9fd981ca71aeaa45c888485c11788456bd838':
Fix system hotkey handling.