git.osdn.net Git - android-x86/frameworks-native.git/log

Scott Main [Fri, 18 Nov 2011 00:00:00 +0000 (16:00 -0800)]

am 47df7ee8: am 309643d9: am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1

* commit '47df7ee84c0259980a896cd4ac28f14171b0ea9e':
docs: add sums/sizes for adt 15.0.1

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 23:59:59 +0000 (15:59 -0800)]

am fb7dca80: am 7f9c1c67: (-s ours) am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

* commit 'fb7dca80a58ff6a444f44f315f0376fae474224d':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

commit | commitdiff | tree

Robert Ly [Thu, 17 Nov 2011 23:59:56 +0000 (15:59 -0800)]

am 57ce9804: am 57e16ed5: am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0

* commit '57ce98045947bcc871128f721dd9b4eed189a4fe':
docs: adt 15.0.1 rel notes

commit | commitdiff | tree

Christopher Tate [Thu, 17 Nov 2011 23:59:54 +0000 (15:59 -0800)]

am 7c37ce8b: am 7d997121: am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1

* commit '7c37ce8b0141fd41e3946a3fa409bb863fa309f7':
Add a few GC-flexing microbenchmark tests

commit | commitdiff | tree

Jake Hamby [Thu, 17 Nov 2011 23:59:52 +0000 (15:59 -0800)]

am a4d76b81: am 2084d206: am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

* commit 'a4d76b81a57577d7dded9ff58d97c4fcbe09e78e':
Re-enable vril-dump for adb bugreport.

commit | commitdiff | tree

Scott Main [Thu, 17 Nov 2011 23:56:37 +0000 (15:56 -0800)]

am 309643d9: am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1

* commit '309643d93afd877b279acbe298b2258b62f67f53':
docs: add sums/sizes for adt 15.0.1

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 23:56:36 +0000 (15:56 -0800)]

am 7f9c1c67: (-s ours) am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

* commit '7f9c1c67ef135a5e7b8226a0003df525adc2593c':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

commit | commitdiff | tree

Robert Ly [Thu, 17 Nov 2011 23:56:34 +0000 (15:56 -0800)]

am 57e16ed5: am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0

* commit '57e16ed5f6c254b8b59d1effec2c4a8f3f43eac8':
docs: adt 15.0.1 rel notes

commit | commitdiff | tree

Christopher Tate [Thu, 17 Nov 2011 23:56:28 +0000 (15:56 -0800)]

am 7d997121: am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1

* commit '7d9971213ff8fbfd41fa7039300ac28f555f43be':
Add a few GC-flexing microbenchmark tests

commit | commitdiff | tree

Jake Hamby [Thu, 17 Nov 2011 23:56:25 +0000 (15:56 -0800)]

am 2084d206: am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

* commit '2084d20668a79e5a31ec7365652434ec943503ef':
Re-enable vril-dump for adb bugreport.

commit | commitdiff | tree

Nick Kralevich [Thu, 17 Nov 2011 23:33:07 +0000 (15:33 -0800)]

am 8549aeea: Merge "Rename EntropyService to EntropyMixer"

* commit '8549aeea0af63810bd5a661a23079d6554e4717b':
Rename EntropyService to EntropyMixer

commit | commitdiff | tree

Nick Kralevich [Thu, 17 Nov 2011 23:30:46 +0000 (15:30 -0800)]

Merge "Rename EntropyService to EntropyMixer"

commit | commitdiff | tree

Matthew Xie [Thu, 17 Nov 2011 23:17:53 +0000 (15:17 -0800)]

am a5ca41e9: am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0

* commit 'a5ca41e9cc82628a8776d8dd78f0ec270d69dda4':
Check the bluetooth state for getUuid call

commit | commitdiff | tree

Nick Pelly [Thu, 17 Nov 2011 23:17:51 +0000 (15:17 -0800)]

am f955d057: am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

* commit 'f955d057ddd232af4bd4a74075838dae298c7365':
Fix NPE on devices that don't have NFC.

commit | commitdiff | tree

David Brown [Thu, 17 Nov 2011 23:17:49 +0000 (15:17 -0800)]

am 85a80ba8: am 19a57bde: am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1

* commit '85a80ba8cd92fd0a7f7e4a899e772b0f6a50a9d7':
SIP addresses containing "911" shouldn't be considered emergency calls

commit | commitdiff | tree

Dave Santoro [Thu, 17 Nov 2011 23:17:47 +0000 (15:17 -0800)]

am c5b057f4: am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1

* commit 'c5b057f42372e7a3b0560afe88a243378255c2e2':
Unhide social stream permissions.

commit | commitdiff | tree

Michael Kolb [Thu, 17 Nov 2011 23:17:45 +0000 (15:17 -0800)]

am 778f146c: am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1

* commit '778f146cf422edabf140a18afa8746e542a49ebd':
Draw input field focus ring in WebTextView

commit | commitdiff | tree

Jeff Sharkey [Thu, 17 Nov 2011 23:17:43 +0000 (15:17 -0800)]

am f0c22dc4: am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1

* commit 'f0c22dc4a043264a2b15d225fd97909b403c02cf':
Only write network stats when already loaded.

commit | commitdiff | tree

Matthew Xie [Thu, 17 Nov 2011 23:13:03 +0000 (15:13 -0800)]

am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0

* commit 'a4f5c425b822a46fc49bc87bba82688570584ff1':
Check the bluetooth state for getUuid call

commit | commitdiff | tree

Nick Pelly [Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)]

am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
Fix NPE on devices that don't have NFC.

commit | commitdiff | tree

David Brown [Thu, 17 Nov 2011 23:12:54 +0000 (15:12 -0800)]

am 19a57bde: am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1

* commit '19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81':
SIP addresses containing "911" shouldn't be considered emergency calls

commit | commitdiff | tree

Dave Santoro [Thu, 17 Nov 2011 23:12:52 +0000 (15:12 -0800)]

am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1

* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
Unhide social stream permissions.

commit | commitdiff | tree

Michael Kolb [Thu, 17 Nov 2011 23:12:49 +0000 (15:12 -0800)]

am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1

* commit '5397bb52fba04e8dc8496d731611210213847308':
Draw input field focus ring in WebTextView

commit | commitdiff | tree

Jeff Sharkey [Thu, 17 Nov 2011 23:12:45 +0000 (15:12 -0800)]

am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1

* commit '7892cbffbeffb6e73f4c88e9965064b3985971c2':
Only write network stats when already loaded.

commit | commitdiff | tree

Alex Sakhartchouk [Thu, 17 Nov 2011 22:54:43 +0000 (14:54 -0800)]

am 94b064e1: Merge "adding benchmark single test"

* commit '94b064e11216310c813e72459bc89aa962263ab6':
adding benchmark single test

commit | commitdiff | tree

Scott Main [Thu, 17 Nov 2011 22:53:46 +0000 (14:53 -0800)]

am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1

* commit 'fa847110524512b4bb1cb8e655471d324aba69ff':
docs: add sums/sizes for adt 15.0.1

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 22:53:45 +0000 (14:53 -0800)]

am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

* commit 'c2c77700fbab25bc48002a46a6c0d8a81008030c':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

commit | commitdiff | tree

Robert Ly [Thu, 17 Nov 2011 22:53:43 +0000 (14:53 -0800)]

am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0

* commit '0a2da86346f1f74b66425565e783efb2d5239f25':
docs: adt 15.0.1 rel notes

commit | commitdiff | tree

Alex Sakhartchouk [Thu, 17 Nov 2011 22:52:23 +0000 (14:52 -0800)]

Merge "adding benchmark single test"

commit | commitdiff | tree

Scott Main [Thu, 17 Nov 2011 22:49:28 +0000 (14:49 -0800)]

am 7d4c4721: docs: add sums/sizes for adt 15.0.1

* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
docs: add sums/sizes for adt 15.0.1

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 22:49:26 +0000 (14:49 -0800)]

am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

commit | commitdiff | tree

Robert Ly [Thu, 17 Nov 2011 22:49:21 +0000 (14:49 -0800)]

am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0

* commit '4f361741185d523b5469a264521eeeb4eee9344d':
docs: adt 15.0.1 rel notes

commit | commitdiff | tree

Christopher Tate [Thu, 17 Nov 2011 22:45:26 +0000 (14:45 -0800)]

am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1

* commit '4cf1656e10514d0575304d5a8108bc7a0b7384ed':
Add a few GC-flexing microbenchmark tests

commit | commitdiff | tree

Christopher Tate [Thu, 17 Nov 2011 22:43:17 +0000 (14:43 -0800)]

Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1

commit | commitdiff | tree

Glenn Kasten [Thu, 17 Nov 2011 22:10:50 +0000 (14:10 -0800)]

am aba3d10f: Merge "Bug 5522189 re-enable ARM opts but disable inline"

* commit 'aba3d10f376dc7b64fc66e669f16202750958f20':
Bug 5522189 re-enable ARM opts but disable inline

commit | commitdiff | tree

Glenn Kasten [Thu, 17 Nov 2011 22:08:31 +0000 (14:08 -0800)]

Merge "Bug 5522189 re-enable ARM opts but disable inline"

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jake Hamby [Thu, 17 Nov 2011 21:53:17 +0000 (13:53 -0800)]

Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Thu, 17 Nov 2011 21:23:17 +0000 (13:23 -0800)]

am 16991b14: am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1

* commit '16991b1438ced6fb6cb482bd04b03744ecf34d83':
Don't upgrade some settings from GB to ICS.

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 21:23:16 +0000 (13:23 -0800)]

am 66f5cf4d: am a8f7b7c4: am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1

* commit '66f5cf4d29cf06f241462b3cec2878b07ca23985':
Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.

commit | commitdiff | tree

Andreas Huber [Thu, 17 Nov 2011 21:23:14 +0000 (13:23 -0800)]

am aa257611: am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

* commit 'aa25761114b143ed3182d97004ec1366c2ae850e':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...

commit | commitdiff | tree

John Reck [Thu, 17 Nov 2011 21:23:12 +0000 (13:23 -0800)]

am a93a7d6d: am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1

* commit 'a93a7d6d15295e36b54b928bc57f0b5ca239714a':
Fix add single character check

commit | commitdiff | tree

John Reck [Thu, 17 Nov 2011 21:23:09 +0000 (13:23 -0800)]

am 6810017f: am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1

* commit '6810017f6a7108449a8c08fcf15e1305dcba96f3':
Undeprecate LayoutAlgorithm

commit | commitdiff | tree

Amith Yamasani [Thu, 17 Nov 2011 21:20:22 +0000 (13:20 -0800)]

am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1

* commit '664bb774f528fead63d7c0e62b533da66390b246':
Don't upgrade some settings from GB to ICS.

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 21:20:19 +0000 (13:20 -0800)]

am a8f7b7c4: am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1

* commit 'a8f7b7c4794d62df4b3cec67dee1a9887afb53a4':
Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.

commit | commitdiff | tree

Andreas Huber [Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)]

am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

* commit '624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...

commit | commitdiff | tree

John Reck [Thu, 17 Nov 2011 21:20:15 +0000 (13:20 -0800)]

am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1

* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
Fix add single character check

commit | commitdiff | tree

John Reck [Thu, 17 Nov 2011 21:20:12 +0000 (13:20 -0800)]

am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1

* commit '2c6afef8766371bf933f8675c80687802ce045e0':
Undeprecate LayoutAlgorithm

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Dave Santoro [Thu, 17 Nov 2011 20:26:17 +0000 (12:26 -0800)]

Merge "Unhide social stream permissions." into ics-mr1

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Thu, 17 Nov 2011 20:22:58 +0000 (12:22 -0800)]

Merge "Draw input field focus ring in WebTextView" into ics-mr1

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jeff Sharkey [Thu, 17 Nov 2011 20:10:02 +0000 (12:10 -0800)]

Merge "Only write network stats when already loaded." into ics-mr1

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jack Palevich [Thu, 17 Nov 2011 19:05:30 +0000 (11:05 -0800)]

Merge "Fix potential GLThread / GLSurfaceView memory leak."

commit | commitdiff | tree

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).

commit | commitdiff | tree

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)."

commit | commitdiff | tree

Alex Sakhartchouk [Thu, 17 Nov 2011 18:14:21 +0000 (10:14 -0800)]

am 54b851c9: Merge "DO NOT MERGE"

* commit '54b851c9b5f06b754f64892d24069d95adac86f5':
DO NOT MERGE

commit | commitdiff | tree

Alex Sakhartchouk [Thu, 17 Nov 2011 18:12:13 +0000 (10:12 -0800)]

Merge "DO NOT MERGE"

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Fred Chung [Thu, 17 Nov 2011 17:38:10 +0000 (09:38 -0800)]

Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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."

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Reck [Thu, 17 Nov 2011 16:48:04 +0000 (08:48 -0800)]

Merge "Fix add single character check" into ics-mr1

commit | commitdiff | tree

John Reck [Thu, 17 Nov 2011 16:47:29 +0000 (08:47 -0800)]

Merge "Undeprecate LayoutAlgorithm" into ics-mr1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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