OSDN Git Service
Jake Hamby [Thu, 17 Nov 2011 21:55:29 +0000 (13:55 -0800)]
am
0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '
0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
Re-enable vril-dump for adb bugreport.
Jake Hamby [Thu, 17 Nov 2011 21:53:17 +0000 (13:53 -0800)]
Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
Matthew Xie [Thu, 17 Nov 2011 21:12:39 +0000 (13:12 -0800)]
am
2b9af44e: am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
2b9af44e401d884469869a4ac0933bfa727d3135':
Check the bluetooth state for getUuid call
Matthew Xie [Thu, 17 Nov 2011 21:10:14 +0000 (13:10 -0800)]
am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
Nick Pelly [Thu, 17 Nov 2011 20:51:18 +0000 (12:51 -0800)]
am
63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '
63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
Fix NPE on devices that don't have NFC.
Nick Pelly [Thu, 17 Nov 2011 20:48:48 +0000 (12:48 -0800)]
Merge "Fix NPE on devices that don't have NFC." into ics-mr1
David Brown [Thu, 17 Nov 2011 20:35:26 +0000 (12:35 -0800)]
am
1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '
1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2':
SIP addresses containing "911" shouldn't be considered emergency calls
David Brown [Thu, 17 Nov 2011 20:33:00 +0000 (12:33 -0800)]
Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1
Dave Santoro [Thu, 17 Nov 2011 20:27:44 +0000 (12:27 -0800)]
am
9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '
9be4962060ca67c4fe9bfc391043f6d2829cf720':
Unhide social stream permissions.
Dave Santoro [Thu, 17 Nov 2011 20:26:17 +0000 (12:26 -0800)]
Merge "Unhide social stream permissions." into ics-mr1
Michael Kolb [Thu, 17 Nov 2011 20:25:06 +0000 (12:25 -0800)]
am
852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '
852585c034d383ea6afe1b484afa57cbf4d04f95':
Draw input field focus ring in WebTextView
Michael Kolb [Thu, 17 Nov 2011 20:22:58 +0000 (12:22 -0800)]
Merge "Draw input field focus ring in WebTextView" into ics-mr1
Jeff Sharkey [Thu, 17 Nov 2011 20:11:47 +0000 (12:11 -0800)]
am
8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '
8ac35e30b29f3a3e81ed722621bf7f1de708455f':
Only write network stats when already loaded.
Jeff Sharkey [Thu, 17 Nov 2011 20:10:02 +0000 (12:10 -0800)]
Merge "Only write network stats when already loaded." into ics-mr1
Amith Yamasani [Thu, 17 Nov 2011 18:02:16 +0000 (10:02 -0800)]
am
aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit '
aefc0ed9677233d5e8c991196f970222b4899dc3':
Don't upgrade some settings from GB to ICS.
Amith Yamasani [Thu, 17 Nov 2011 18:01:00 +0000 (10:01 -0800)]
Merge "Don't upgrade some settings from GB to ICS." into ics-mr1
Fred Chung [Thu, 17 Nov 2011 17:39:28 +0000 (09:39 -0800)]
am
3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
* commit '
3a7e2c0ba89b40b61d2322955ab895020a70592c':
Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
Fred Chung [Thu, 17 Nov 2011 17:37:15 +0000 (09:37 -0800)]
Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
Andreas Huber [Thu, 17 Nov 2011 17:07:36 +0000 (09:07 -0800)]
am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
John Reck [Thu, 17 Nov 2011 16:49:50 +0000 (08:49 -0800)]
am
775e986e: Merge "Fix add single character check" into ics-mr1
* commit '
775e986ece16b90d3260fe8c7f8e18fc3d0cf492':
Fix add single character check
John Reck [Thu, 17 Nov 2011 16:49:49 +0000 (08:49 -0800)]
am
1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '
1da3d656358ab577f285d06e9db249dfb21cb8e3':
Undeprecate LayoutAlgorithm
John Reck [Thu, 17 Nov 2011 16:48:04 +0000 (08:48 -0800)]
Merge "Fix add single character check" into ics-mr1
John Reck [Thu, 17 Nov 2011 16:47:29 +0000 (08:47 -0800)]
Merge "Undeprecate LayoutAlgorithm" into ics-mr1
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
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
Matthew Xie [Wed, 16 Nov 2011 23:31:03 +0000 (15:31 -0800)]
Merge "Check the bluetooth state for getUuid call" into ics-mr0
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
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
Robert Greenwalt [Wed, 16 Nov 2011 20:06:53 +0000 (12:06 -0800)]
Merge "Fix TelephonyManager to grab the best context" into ics-mr1
Jamie Gennis [Wed, 16 Nov 2011 19:36:17 +0000 (11:36 -0800)]
am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
fd6b64f6ad040b4d550a5219a2576997e2c0e85d':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Jamie Gennis [Wed, 16 Nov 2011 19:34:30 +0000 (11:34 -0800)]
Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 19:02:20 +0000 (11:02 -0800)]
am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
7dc81e06e4d0554683595e8d2e318837548e249a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:57:45 +0000 (10:57 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Gilles Debunne [Wed, 16 Nov 2011 18:37:23 +0000 (10:37 -0800)]
am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
IME action (done, next...) correctly handled
Gilles Debunne [Wed, 16 Nov 2011 18:31:40 +0000 (10:31 -0800)]
Merge "IME action (done, next...) correctly handled" into ics-mr1
Alex Sakhartchouk [Wed, 16 Nov 2011 17:48:26 +0000 (09:48 -0800)]
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 '
4c593010dddc6d2972bab87b30bd1b11987a09e1':
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 [Wed, 16 Nov 2011 17:48:20 +0000 (09:48 -0800)]
am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
Bluetooth HDP sample.
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
Alex Sakhartchouk [Wed, 16 Nov 2011 17:40:11 +0000 (09:40 -0800)]
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
Fred Chung [Wed, 16 Nov 2011 17:31:54 +0000 (09:31 -0800)]
Merge "Bluetooth HDP sample." into ics-mr1
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
The Android Open Source Project [Wed, 16 Nov 2011 15:38:11 +0000 (07:38 -0800)]
am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
c7403258528a08ab74f7c29277d0c34ba6edc53d':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:33:58 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
Mathias Agopian [Wed, 16 Nov 2011 08:08:08 +0000 (00:08 -0800)]
remove hack that hardcoded the refresh rate
Change-Id: Ibdd40b337c547e80ef8541856015f1380c8d58ed
Jake Hamby [Wed, 16 Nov 2011 04:19:34 +0000 (20:19 -0800)]
am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
bd7836846c1e5d3610ba6c26686674d429a4316c':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:19:33 +0000 (20:19 -0800)]
am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:19:30 +0000 (20:19 -0800)]
am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:16:47 +0000 (20:16 -0800)]
am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
4fdc36e6d6003cdce911678f0b233697554f8dbf':
Document that release() should be called with onPause() and onStop() for media objects
Jake Hamby [Wed, 16 Nov 2011 04:16:12 +0000 (20:16 -0800)]
am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:16:02 +0000 (20:16 -0800)]
am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:15:57 +0000 (20:15 -0800)]
am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
0fd69ff4b9311c6b5406b769d50c9aa22787b816':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:13:03 +0000 (20:13 -0800)]
Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
Adam Powell [Wed, 16 Nov 2011 03:54:04 +0000 (19:54 -0800)]
am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
45f05c9580739ffe2d665cec50efb0bb57d757ba':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:51:56 +0000 (19:51 -0800)]
Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 03:19:04 +0000 (19:19 -0800)]
am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
Eliminate hw.keyboards system properties.
Jeff Brown [Wed, 16 Nov 2011 03:17:09 +0000 (19:17 -0800)]
Merge "Eliminate hw.keyboards system properties." into ics-mr1
The Android Automerger [Wed, 16 Nov 2011 03:08:44 +0000 (19:08 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Wed, 16 Nov 2011 03:06:20 +0000 (19:06 -0800)]
am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
cdec187a27b2acc34cd4df26b836b83362527d6a':
Whoops, need to acquire lock.
Dianne Hackborn [Wed, 16 Nov 2011 03:04:11 +0000 (19:04 -0800)]
Merge "Whoops, need to acquire lock." into ics-mr1
Jean-Michel Trivi [Wed, 16 Nov 2011 02:21:44 +0000 (18:21 -0800)]
am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
0ddb0143895b816d4ff5c174b346390e07f26556':
Fix
5623252 unlink to death of audio focus client early
Jean-Michel Trivi [Wed, 16 Nov 2011 02:19:34 +0000 (18:19 -0800)]
Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 02:15:18 +0000 (18:15 -0800)]
am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
rework a bit how we manage EGL extensions
Mathias Agopian [Wed, 16 Nov 2011 02:12:00 +0000 (18:12 -0800)]
Merge "rework a bit how we manage EGL extensions" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 01:48:10 +0000 (17:48 -0800)]
Eliminate hw.keyboards system properties.
Stop using system properties to publish information about
the key character map path. Instead, we can retrieve it
on demand by asking the window manager.
It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.
Bug:
5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
Jim Miller [Wed, 16 Nov 2011 00:18:32 +0000 (16:18 -0800)]
am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
c57bfa4a4bf4c810b5c663df17443463d8192e8f':
Fix
5581164: Add abbreviated localized date strings
Jim Miller [Tue, 15 Nov 2011 23:44:17 +0000 (15:44 -0800)]
am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
34a62348be92034a9fb7582e51754224785568dc':
Fix
5581164: Use abbreviated day in lockscreen
Jim Miller [Tue, 15 Nov 2011 23:42:20 +0000 (15:42 -0800)]
Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:05:24 +0000 (15:05 -0800)]
am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
fix for build breakage.
OSDN Git Service
