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

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

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

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

Merge "adding benchmark single test"

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

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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1

* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
Clean up the spell checker framework

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Glenn Kasten [Thu, 17 Nov 2011 15:14:41 +0000 (07:14 -0800)]

Merge "MidiFile uses C++ Thread not createThreadEtc"

commit | commitdiff | tree

Glenn Kasten [Thu, 17 Nov 2011 15:14:29 +0000 (07:14 -0800)]

Merge "JetPlayer uses C++ Thread not createThreadEtc"

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kristian Monsen [Thu, 17 Nov 2011 13:46:01 +0000 (05:46 -0800)]

am ec2b01e7: Merge "Fix fix for bug 2816327"

* commit 'ec2b01e78858a4e6b304f07afb32d76bea6804fb':
Fix fix for bug 2816327

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kristian Monsen [Thu, 17 Nov 2011 13:43:40 +0000 (05:43 -0800)]

Merge "Fix fix for bug 2816327"

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

The Android Open Source Project [Thu, 17 Nov 2011 12:12:57 +0000 (04:12 -0800)]

am d949eddd: am 4dce941e: am 816e68e2: No-op merge from ics-mr0

* commit 'd949edddc0c7497a8a45cece5464e041eae8625e':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]

am 4dce941e: am 816e68e2: No-op merge from ics-mr0

* commit '4dce941ecec71aa999cf777a43f05821793b6749':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jeff Sharkey [Thu, 17 Nov 2011 06:59:13 +0000 (22:59 -0800)]