OSDN Git Service
Ben Murdoch [Thu, 17 Nov 2011 19:49:14 +0000 (11:49 -0800)]
am
131ed03f: am
e6269f79: am
fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit '
131ed03f30ff85b00ee4f3cd01108f9742c356c2':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
Jeff Sharkey [Thu, 17 Nov 2011 19:49:12 +0000 (11:49 -0800)]
am
ee737d9e: am
66b570c7: am
b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '
ee737d9e44e14e51b484defe34316cdead08e735':
Update NTP outside locks, log large trim events.
Daniel Sandler [Thu, 17 Nov 2011 19:49:08 +0000 (11:49 -0800)]
am
470dfcd0: am
a092482c: am
293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '
470dfcd03028aa1cb63448314f0e96d86a46f997':
Activate Dreams (screen saver) when desk-docked.
Daniel Sandler [Thu, 17 Nov 2011 19:49:06 +0000 (11:49 -0800)]
am
f27e94ce: am
7fd3ba91: am
d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '
f27e94ce9db83f01a98eefd0add04e7a19dde60d':
Disable desk dock apps.
Mathias Agopian [Thu, 17 Nov 2011 19:49:03 +0000 (11:49 -0800)]
am
ce51c10f: am
2030d78d: am
8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1
* commit '
ce51c10fc139c9383229ff21698bdc72fe83c8d0':
be a bit more defensive when parsing extension strings
Nicolas Roard [Thu, 17 Nov 2011 19:49:00 +0000 (11:49 -0800)]
am
0ecd89bc: am
e788fa84: am
e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
* commit '
0ecd89bce353e2d25047628eca7ffa3c79cd5c7b':
Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
Ben Murdoch [Thu, 17 Nov 2011 19:46:30 +0000 (11:46 -0800)]
am
e6269f79: am
fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit '
e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
Jeff Sharkey [Thu, 17 Nov 2011 19:46:26 +0000 (11:46 -0800)]
am
66b570c7: am
b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '
66b570c70471976cd2a99825898c778a7850f2c8':
Update NTP outside locks, log large trim events.
Daniel Sandler [Thu, 17 Nov 2011 19:46:23 +0000 (11:46 -0800)]
am
a092482c: am
293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '
a092482c17830b985798d5da9c1d1951735bacf3':
Activate Dreams (screen saver) when desk-docked.
Daniel Sandler [Thu, 17 Nov 2011 19:46:21 +0000 (11:46 -0800)]
am
7fd3ba91: am
d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '
7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f':
Disable desk dock apps.
Mathias Agopian [Thu, 17 Nov 2011 19:46:20 +0000 (11:46 -0800)]
am
2030d78d: am
8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1
* commit '
2030d78dc9c20d2f561f4b11f1a1adddb63661c6':
be a bit more defensive when parsing extension strings
Nicolas Roard [Thu, 17 Nov 2011 19:46:09 +0000 (11:46 -0800)]
am
e788fa84: am
e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
* commit '
e788fa84f1fac845e50922fc536694ce1cc2fbdb':
Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
Jack Palevich [Thu, 17 Nov 2011 19:07:16 +0000 (11:07 -0800)]
am
22da9a8b: Merge "Fix potential GLThread / GLSurfaceView memory leak."
* commit '
22da9a8beb4af362fbe9a108234d40b341c8d9fb':
Fix potential GLThread / GLSurfaceView memory leak.
Jack Palevich [Thu, 17 Nov 2011 19:05:30 +0000 (11:05 -0800)]
Merge "Fix potential GLThread / GLSurfaceView memory leak."
Jesse Wilson [Thu, 17 Nov 2011 18:44:54 +0000 (10:44 -0800)]
am
9ab5fa0a: Merge "Add a link from LruCache to the Android support package (compatibility library)."
* commit '
9ab5fa0aaadcfdc27e993caceececebb8141e01f':
Add a link from LruCache to the Android support package (compatibility library).
Jesse Wilson [Thu, 17 Nov 2011 18:42:48 +0000 (10:42 -0800)]
Merge "Add a link from LruCache to the Android support package (compatibility library)."
Alex Sakhartchouk [Thu, 17 Nov 2011 18:14:21 +0000 (10:14 -0800)]
am
54b851c9: Merge "DO NOT MERGE"
* commit '
54b851c9b5f06b754f64892d24069d95adac86f5':
DO NOT MERGE
Alex Sakhartchouk [Thu, 17 Nov 2011 18:12:13 +0000 (10:12 -0800)]
Merge "DO NOT MERGE"
Alex Sakhartchouk [Thu, 17 Nov 2011 17:15:42 +0000 (09:15 -0800)]
am
50445568: Merge "Fixing FBO font rendering bug that resulted from using old surface size."
* commit '
5044556861af496d6451aef3f69a4df0d1b591c9':
Fixing FBO font rendering bug that resulted from using old surface size.
Alex Sakhartchouk [Thu, 17 Nov 2011 17:13:24 +0000 (09:13 -0800)]
Merge "Fixing FBO font rendering bug that resulted from using old surface size."
Matthew Xie [Thu, 17 Nov 2011 15:52:26 +0000 (07:52 -0800)]
am
1bce803f: am
37fb92fb: am
302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
* commit '
1bce803f663d50a3a60fab63f565f91bce5c35e5':
Call notifyIncomingA2dpConnection with correct rejected status
Mathias Agopian [Thu, 17 Nov 2011 15:52:24 +0000 (07:52 -0800)]
am
280271d1: am
f14ce7db: am
1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1
* commit '
280271d1f279212e6017deb8ca453edb791ed196':
remove hack that hardcoded the refresh rate
Mangesh Ghiware [Thu, 17 Nov 2011 15:52:22 +0000 (07:52 -0800)]
am
163994c1: am
55116350: am
4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '
163994c1d4206813f621bad04b808d08f753fb7d':
Revert change to setInitialScale() to take display density into account.
satok [Thu, 17 Nov 2011 15:52:20 +0000 (07:52 -0800)]
am
8bc972a5: am
9e502e90: am
e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit '
8bc972a5a4c3e24d1b9ba9b1dd4b4e2bbb5dadac':
Clean up the spell checker framework
Daniel Sandler [Thu, 17 Nov 2011 15:52:17 +0000 (07:52 -0800)]
am
28b23cde: am
8b9ba6fa: am
f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '
28b23cdef491a270d6fcd4d60f5aebef3f10f370':
Add a default Dreams component.
Daniel Sandler [Thu, 17 Nov 2011 15:52:15 +0000 (07:52 -0800)]
am
0505984a: am
e11bcd1d: am
5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '
0505984abb503dbb64a521d7d1e27550f7a7b91b':
Remove day of week from phone notification panel.
Mathias Agopian [Thu, 17 Nov 2011 15:52:11 +0000 (07:52 -0800)]
am
905a12a9: am
abdade71: am
69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '
905a12a949e779b50ad7ab0d69047b6e047ad7b8':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Marco Nelissen [Thu, 17 Nov 2011 15:52:08 +0000 (07:52 -0800)]
am
5a1623b3: am
3de68918: am
e937da83: Merge "Change MediaController look b/
5584613" into ics-mr1
* commit '
5a1623b379662e95580736510e1640148c228123':
Change MediaController look b/
5584613
Matthew Xie [Thu, 17 Nov 2011 15:48:29 +0000 (07:48 -0800)]
am
37fb92fb: am
302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
* commit '
37fb92fb634d10ca94731a73f2a60d86135baa6a':
Call notifyIncomingA2dpConnection with correct rejected status
Mathias Agopian [Thu, 17 Nov 2011 15:48:27 +0000 (07:48 -0800)]
am
f14ce7db: am
1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1
* commit '
f14ce7db5dc327724984946e7754c777908cc2ad':
remove hack that hardcoded the refresh rate
Mangesh Ghiware [Thu, 17 Nov 2011 15:48:24 +0000 (07:48 -0800)]
am
55116350: am
4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '
5511635090072ce02a4fb07ec25a7c279a7bbc8a':
Revert change to setInitialScale() to take display density into account.
satok [Thu, 17 Nov 2011 15:48:17 +0000 (07:48 -0800)]
am
9e502e90: am
e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit '
9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
Clean up the spell checker framework
Daniel Sandler [Thu, 17 Nov 2011 15:48:15 +0000 (07:48 -0800)]
am
8b9ba6fa: am
f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '
8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
Add a default Dreams component.
Daniel Sandler [Thu, 17 Nov 2011 15:48:12 +0000 (07:48 -0800)]
am
e11bcd1d: am
5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '
e11bcd1d72cb45af984b9d457c4306f51923e853':
Remove day of week from phone notification panel.
Mathias Agopian [Thu, 17 Nov 2011 15:48:10 +0000 (07:48 -0800)]
am
abdade71: am
69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '
abdade71bc17153696fe2abe281c5a3b0c2e5abe':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Marco Nelissen [Thu, 17 Nov 2011 15:48:01 +0000 (07:48 -0800)]
am
3de68918: am
e937da83: Merge "Change MediaController look b/
5584613" into ics-mr1
* commit '
3de689186531cebfabcb4b4d4163eae6baac528d':
Change MediaController look b/
5584613
Glenn Kasten [Thu, 17 Nov 2011 15:16:21 +0000 (07:16 -0800)]
am
7418e385: Merge "MidiFile uses C++ Thread not createThreadEtc"
* commit '
7418e385f4523b94662d3fef614dac26d8a36885':
MidiFile uses C++ Thread not createThreadEtc
Glenn Kasten [Thu, 17 Nov 2011 15:16:18 +0000 (07:16 -0800)]
am
b447e9ce: Merge "JetPlayer uses C++ Thread not createThreadEtc"
* commit '
b447e9ce1d3dc603a8879340f36a4ca4f22d6b62':
JetPlayer uses C++ Thread not createThreadEtc
Glenn Kasten [Thu, 17 Nov 2011 15:14:41 +0000 (07:14 -0800)]
Merge "MidiFile uses C++ Thread not createThreadEtc"
Glenn Kasten [Thu, 17 Nov 2011 15:14:29 +0000 (07:14 -0800)]
Merge "JetPlayer uses C++ Thread not createThreadEtc"
Dianne Hackborn [Thu, 17 Nov 2011 13:51:08 +0000 (05:51 -0800)]
am
77c5f4de: am
9aa6bd1c: am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
77c5f4def49357a89abd9849b0bab950179d71f4':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Thu, 17 Nov 2011 13:51:06 +0000 (05:51 -0800)]
am
7cd2b19a: am
65952ec4: am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
7cd2b19a926224dee2b2e12f37c1d71ce658bf97':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Robert Greenwalt [Thu, 17 Nov 2011 13:51:04 +0000 (05:51 -0800)]
am
89d94e35: am
795fcd07: am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
89d94e35509a03de47e3e29b92229a851fcee4d2':
Fix TelephonyManager to grab the best context
Jamie Gennis [Thu, 17 Nov 2011 13:51:02 +0000 (05:51 -0800)]
am
04dd4dea: am
7765fc65: am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
04dd4deafdbde8e4a9d12745e3d4a886ef8769f4':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Eric Fischer [Thu, 17 Nov 2011 13:51:00 +0000 (05:51 -0800)]
am
6c932dab: am
02ed923d: (-s ours) am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
6c932dab1cef4fc711c4fdab938bced67b15d5df':
Import revised translations. DO NOT MERGE
Gilles Debunne [Thu, 17 Nov 2011 13:50:57 +0000 (05:50 -0800)]
am
664d87ef: am
b3272d29: am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
664d87ef01f7b4dbd7c96f23db73aba6cbc57481':
IME action (done, next...) correctly handled
Dianne Hackborn [Thu, 17 Nov 2011 13:46:34 +0000 (05:46 -0800)]
am
9aa6bd1c: am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
9aa6bd1c34fe3583fe31f283a6415e84fec12567':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Thu, 17 Nov 2011 13:46:32 +0000 (05:46 -0800)]
am
65952ec4: am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
65952ec4dc0e1703eb87a54c252953c53d07affc':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Robert Greenwalt [Thu, 17 Nov 2011 13:46:05 +0000 (05:46 -0800)]
am
795fcd07: am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
Fix TelephonyManager to grab the best context
Kristian Monsen [Thu, 17 Nov 2011 13:46:01 +0000 (05:46 -0800)]
Jamie Gennis [Thu, 17 Nov 2011 13:46:00 +0000 (05:46 -0800)]
am
7765fc65: am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Eric Fischer [Thu, 17 Nov 2011 13:45:54 +0000 (05:45 -0800)]
am
02ed923d: (-s ours) am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
02ed923da995a10c537018861cfc149d04c66bc2':
Import revised translations. DO NOT MERGE
Gilles Debunne [Thu, 17 Nov 2011 13:45:29 +0000 (05:45 -0800)]
am
b3272d29: am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
b3272d297bb45e5cd3201766baef4fef7921ce05':
IME action (done, next...) correctly handled
Kristian Monsen [Thu, 17 Nov 2011 13:43:40 +0000 (05:43 -0800)]
Merge "Fix fix for bug
2816327"
Alex Sakhartchouk [Thu, 17 Nov 2011 12:13:03 +0000 (04:13 -0800)]
am
e693fa3e: am
a962ef29: am
4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '
e693fa3e184f7a49f9bf912a0dac057fb339b8a4':
Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
Fred Chung [Thu, 17 Nov 2011 12:13:01 +0000 (04:13 -0800)]
am
d2789aa3: am
d592714d: am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
d2789aa322357ebb453bcad8825a33b27bb78c29':
Bluetooth HDP sample.
The Android Open Source Project [Thu, 17 Nov 2011 12:12:57 +0000 (04:12 -0800)]
Alex Sakhartchouk [Thu, 17 Nov 2011 12:08:30 +0000 (04:08 -0800)]
am
a962ef29: am
4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '
a962ef2993099e6c5db3809a7e829e43c8cf084a':
Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
Fred Chung [Thu, 17 Nov 2011 12:08:28 +0000 (04:08 -0800)]
am
d592714d: am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
d592714d9a48afce69d6904fc539f150b7c02898':
Bluetooth HDP sample.
The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]
Ben Murdoch [Thu, 17 Nov 2011 10:15:40 +0000 (02:15 -0800)]
am
fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit '
fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
Ben Murdoch [Thu, 17 Nov 2011 10:13:19 +0000 (02:13 -0800)]
Merge changes I59323dc5,I31a01aa3 into ics-mr1
* changes:
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
Jeff Sharkey [Thu, 17 Nov 2011 07:01:15 +0000 (23:01 -0800)]
am
b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '
b9df01d39692c45b182c429015cc2086ef27db97':
Update NTP outside locks, log large trim events.
Jeff Sharkey [Thu, 17 Nov 2011 06:59:13 +0000 (22:59 -0800)]
Merge "Update NTP outside locks, log large trim events." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 06:35:30 +0000 (22:35 -0800)]
am
293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '
293f861aab64a0dbae00bb33c90e6e565a7fabfc':
Activate Dreams (screen saver) when desk-docked.
Daniel Sandler [Thu, 17 Nov 2011 06:35:28 +0000 (22:35 -0800)]
am
d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '
d5decdccc64c59ad62de86c70dbe9ead12150cdc':
Disable desk dock apps.
Daniel Sandler [Thu, 17 Nov 2011 06:33:55 +0000 (22:33 -0800)]
Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 06:33:44 +0000 (22:33 -0800)]
Merge "Disable desk dock apps." into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 05:00:52 +0000 (21:00 -0800)]
am
8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1
* commit '
8fc3540fdf759ff3bb03b00e81d94d6c4102d530':
be a bit more defensive when parsing extension strings
Mathias Agopian [Thu, 17 Nov 2011 04:59:30 +0000 (20:59 -0800)]
Merge "be a bit more defensive when parsing extension strings" into ics-mr1
Nicolas Roard [Thu, 17 Nov 2011 03:42:07 +0000 (19:42 -0800)]
am
e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
* commit '
e88ca718ed9af788f2dc46b5f2db494906bbf41d':
Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
Nicolas Roard [Thu, 17 Nov 2011 03:40:04 +0000 (19:40 -0800)]
Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
Matthew Xie [Thu, 17 Nov 2011 02:25:04 +0000 (18:25 -0800)]
am
302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
* commit '
302afb93d4fd908949ac796eda8343f9683e616a':
Call notifyIncomingA2dpConnection with correct rejected status
Mathias Agopian [Thu, 17 Nov 2011 02:22:26 +0000 (18:22 -0800)]
am
1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1
* commit '
1125f89e47b06b12a0e047d64f1ef953d0c48489':
remove hack that hardcoded the refresh rate
Matthew Xie [Thu, 17 Nov 2011 02:20:50 +0000 (18:20 -0800)]
Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 02:19:33 +0000 (18:19 -0800)]
Merge "remove hack that hardcoded the refresh rate" into ics-mr1
Mangesh Ghiware [Thu, 17 Nov 2011 02:03:51 +0000 (18:03 -0800)]
am
4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '
4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
Revert change to setInitialScale() to take display density into account.
Mangesh Ghiware [Thu, 17 Nov 2011 02:01:35 +0000 (18:01 -0800)]
Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
Steven Ross [Thu, 17 Nov 2011 01:49:02 +0000 (17:49 -0800)]
am
b076bfc5: Merge "Not showing facelock when plugging/unplugging fixes
5438524"
* commit '
b076bfc5e33ba9d234c874e3546b452d8410b668':
Not showing facelock when plugging/unplugging fixes
5438524
Steven Ross [Thu, 17 Nov 2011 01:46:44 +0000 (17:46 -0800)]
Merge "Not showing facelock when plugging/unplugging fixes
5438524"
satok [Thu, 17 Nov 2011 01:37:46 +0000 (17:37 -0800)]
am
e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit '
e5febfd5bd9b19a01383760b523476ba7f013a5c':
Clean up the spell checker framework
satok [Thu, 17 Nov 2011 01:35:54 +0000 (17:35 -0800)]
Merge "Clean up the spell checker framework" into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 01:16:54 +0000 (17:16 -0800)]
am
f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '
f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
Add a default Dreams component.
Daniel Sandler [Thu, 17 Nov 2011 01:14:30 +0000 (17:14 -0800)]
am
5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '
5311917df5fe9804105ff6070346b8fac4b102df':
Remove day of week from phone notification panel.
Daniel Sandler [Thu, 17 Nov 2011 01:13:35 +0000 (17:13 -0800)]
Merge "Add a default Dreams component." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 01:13:16 +0000 (17:13 -0800)]
Merge "Remove day of week from phone notification panel." into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 00:49:25 +0000 (16:49 -0800)]
be a bit more defensive when parsing extension strings
hopefully this will fix a crash in the emulator.
Bug:
5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
Mathias Agopian [Thu, 17 Nov 2011 00:16:11 +0000 (16:16 -0800)]
am
69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '
69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Mathias Agopian [Thu, 17 Nov 2011 00:13:38 +0000 (16:13 -0800)]
Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 23:59:13 +0000 (15:59 -0800)]
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit
e7758be6da85728df6b4215f413660c67c5a9740.
Seemed to cause failures un SurfaceTexture.
Bug:
5627450
Glenn Kasten [Wed, 16 Nov 2011 23:13:18 +0000 (15:13 -0800)]
am
3cce14e8: Merge "Bug
4903178 Restore priority and cgroup on stop"
* commit '
3cce14e8fff950f7e7c8b1649ad4ecbcdefedf6b':
Bug
4903178 Restore priority and cgroup on stop
Glenn Kasten [Wed, 16 Nov 2011 23:11:20 +0000 (15:11 -0800)]
Merge "Bug
4903178 Restore priority and cgroup on stop"
Marco Nelissen [Wed, 16 Nov 2011 22:57:23 +0000 (14:57 -0800)]
am
e937da83: Merge "Change MediaController look b/
5584613" into ics-mr1
* commit '
e937da83143d67fbd709d37bd7418f9807e72baa':
Change MediaController look b/
5584613
Marco Nelissen [Wed, 16 Nov 2011 22:54:20 +0000 (14:54 -0800)]
Merge "Change MediaController look b/
5584613" into ics-mr1
Dianne Hackborn [Wed, 16 Nov 2011 22:37:54 +0000 (14:37 -0800)]
am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
717a25dc2a411edb548859cd6870363346c71b01':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Wed, 16 Nov 2011 22:06:05 +0000 (14:06 -0800)]
am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
4c6a65bc319feab120d40553d93b160908db2f6d':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Dianne Hackborn [Wed, 16 Nov 2011 22:03:09 +0000 (14:03 -0800)]
Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
Fred Quintana [Wed, 16 Nov 2011 20:48:24 +0000 (12:48 -0800)]
am
9a8f2b10: Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
* commit '
9a8f2b1057ce9c9c639d23fbf710aba639db4f7a':
When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display.
Robert Greenwalt [Wed, 16 Nov 2011 20:46:23 +0000 (12:46 -0800)]
am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
33fe4a36b7d1ef84b13447f2a765db465ef96e56':
Fix TelephonyManager to grab the best context
Fred Quintana [Wed, 16 Nov 2011 20:45:14 +0000 (12:45 -0800)]
Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."