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

Romain Guy [Tue, 13 Dec 2011 22:28:46 +0000 (14:28 -0800)]

am 6f2de0a5: Merge "Reduce the number of GL commands generated by the UI"

* commit '6f2de0a5d6303ecff2795a94d5051ea0621be07f':
Reduce the number of GL commands generated by the UI

commit | commitdiff | tree

Andreas Huber [Tue, 13 Dec 2011 22:28:34 +0000 (14:28 -0800)]

am 17453336: am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1

* commit '17453336f4c9ec176ff8a39ab482df0c12e26f63':
DO NOT MERGE: Support for parsing of "folded" RTSP header values

commit | commitdiff | tree

Amith Yamasani [Tue, 13 Dec 2011 22:28:15 +0000 (14:28 -0800)]

am 9413c200: Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB."

* commit '9413c200eb41230ec9bb93f94ee44e09a8b43a7d':
Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 22:28:12 +0000 (14:28 -0800)]

am a2ea425f: Merge "Re-synced MR1 and master for SpellChecker"

* commit 'a2ea425f2541e25c13034b09e37c8a5e6b255d01':
Re-synced MR1 and master for SpellChecker

commit | commitdiff | tree

Selim Gurun [Tue, 13 Dec 2011 22:28:09 +0000 (14:28 -0800)]

am 4f433d53: Merge "Move ssl callbacks to webcore thread."

* commit '4f433d53c9cfe850103b33dfbc2a36fa246f8d96':
Move ssl callbacks to webcore thread.

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 21:13:31 +0000 (13:13 -0800)]

Merge "Reduce the number of GL commands generated by the UI"

commit | commitdiff | tree

Andreas Huber [Tue, 13 Dec 2011 20:04:35 +0000 (12:04 -0800)]

am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1

* commit '22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
DO NOT MERGE: Support for parsing of "folded" RTSP header values

commit | commitdiff | tree

Andreas Huber [Tue, 13 Dec 2011 20:01:46 +0000 (12:01 -0800)]

am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1

* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values

commit | commitdiff | tree

Andreas Huber [Tue, 13 Dec 2011 19:59:50 +0000 (11:59 -0800)]

Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Tue, 13 Dec 2011 18:43:47 +0000 (10:43 -0800)]

Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB."

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 18:31:38 +0000 (10:31 -0800)]

Merge "Re-synced MR1 and master for SpellChecker"

commit | commitdiff | tree

Selim Gurun [Tue, 13 Dec 2011 18:25:18 +0000 (10:25 -0800)]

Merge "Move ssl callbacks to webcore thread."

commit | commitdiff | tree

Chris Craik [Tue, 13 Dec 2011 16:54:45 +0000 (08:54 -0800)]

am 574a1296: Merge "Update tilebenchmark to work with current drawing infrastructure"

* commit '574a12968a24a0c24c96908568d8707a8d713d1c':
Update tilebenchmark to work with current drawing infrastructure

commit | commitdiff | tree

Chris Craik [Tue, 13 Dec 2011 16:53:06 +0000 (08:53 -0800)]

Merge "Update tilebenchmark to work with current drawing infrastructure"

commit | commitdiff | tree

Brian Colonna [Tue, 13 Dec 2011 14:39:50 +0000 (06:39 -0800)]

am 666e6d73: Merge "Changed how Face Unlock coordinates are specified"

* commit '666e6d73c187ecaa771591f87b929c4dff4e84bc':
Changed how Face Unlock coordinates are specified

commit | commitdiff | tree

Brian Colonna [Tue, 13 Dec 2011 14:38:13 +0000 (06:38 -0800)]

Merge "Changed how Face Unlock coordinates are specified"

commit | commitdiff | tree

The Android Open Source Project [Tue, 13 Dec 2011 13:48:36 +0000 (05:48 -0800)]

am 94fac16a: am da296533: Reconcile with ics-mr1-release

* commit '94fac16acc062a7c4c889ca23ebcc7b4e8fecb4c':

commit | commitdiff | tree

Ashish Sharma [Tue, 13 Dec 2011 13:48:24 +0000 (05:48 -0800)]

am 31c5158c: Merge "Add a command option to display installerPackageName"

* commit '31c5158c5aeb2964182f29a4ced947f5603e839e':
Add a command option to display installerPackageName

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 13:48:15 +0000 (05:48 -0800)]

am 5009f65c: Merge "Optimize state changes"

* commit '5009f65c9a676b64869e638e08ec0294e20d7e6e':
Optimize state changes

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Dec 2011 13:48:12 +0000 (05:48 -0800)]

am 4dbfa44a: am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1

* commit '4dbfa44a2164724914b451ab1d6d0af8c0e9d1be':
Avoid NPE when missing network stats.

commit | commitdiff | tree

Mike Cleron [Tue, 13 Dec 2011 13:48:08 +0000 (05:48 -0800)]

am 12d4b3cb: am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1

* commit '12d4b3cb96dd7ceb9e2f742898fc6bcc263a8011':
Update VIBRATE_ON to a supported value when upgrading from GB.

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 13:48:03 +0000 (05:48 -0800)]

am da7642b3: Merge "Minimize the amount of data uploaded to draw text"

* commit 'da7642b31bb3490655016df979b0fad95425ac5f':
Minimize the amount of data uploaded to draw text

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 13:48:01 +0000 (05:48 -0800)]

am 51fbb009: Merge "Various OpenGL optimizations"

* commit '51fbb009661e8eeb41730fe107179425e5392b6d':
Various OpenGL optimizations

commit | commitdiff | tree

Katherine Kuan [Tue, 13 Dec 2011 13:47:57 +0000 (05:47 -0800)]

am 9751190b: Merge "Add logging to country detector logic"

* commit '9751190b85a0e74c1f3bb99d23067149a0de88da':
Add logging to country detector logic

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 13:47:52 +0000 (05:47 -0800)]

am acd5f963: am 0ae6e171: am 359bb3b4: Final API 15.

* commit 'acd5f963b91f481ac0ec05c4b1517cd86eb37fe7':
Final API 15.

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 13:47:50 +0000 (05:47 -0800)]

am df3c49ee: am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

* commit 'df3c49ee2e00f85599348473951a208be9397829':
SDK only: now that support lib is in SDK, we can link to it.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 13:47:45 +0000 (05:47 -0800)]

am ba364285: am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1

* commit 'ba3642850295ac3bdf57cb1ce9a26ec430c2b4c3':
Prevent a memory leak in TextLine.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 13:47:43 +0000 (05:47 -0800)]

am a4b1b8ab: am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1

* commit 'a4b1b8ab3c240efe82d1018a54277f16dc03a8fa':
Text blinking cursor hard to see.

commit | commitdiff | tree

Adam Powell [Tue, 13 Dec 2011 13:47:41 +0000 (05:47 -0800)]

am f8c2abca: am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1

* commit 'f8c2abcadd5d7fbac64f84e6b31ec45102bcf3dd':
Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect

commit | commitdiff | tree

The Android Open Source Project [Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)]

am da296533: Reconcile with ics-mr1-release

* commit 'da29653305f299d6390492333a6360cfa78665d9':

commit | commitdiff | tree

The Android Open Source Project [Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)]

Reconcile with ics-mr1-release

Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8

commit | commitdiff | tree

Ashish Sharma [Tue, 13 Dec 2011 08:31:53 +0000 (00:31 -0800)]

Merge "Add a command option to display installerPackageName"

commit | commitdiff | tree

The Android Automerger [Tue, 13 Dec 2011 06:08:59 +0000 (22:08 -0800)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 04:36:22 +0000 (20:36 -0800)]

Merge "Optimize state changes"

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Dec 2011 04:23:47 +0000 (20:23 -0800)]

am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1

* commit 'f0213bf1833e49744b29be97e44c3e9eaad9449d':
Avoid NPE when missing network stats.

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Dec 2011 04:21:34 +0000 (20:21 -0800)]

am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1

* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
Avoid NPE when missing network stats.

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Dec 2011 04:19:27 +0000 (20:19 -0800)]

Merge "Avoid NPE when missing network stats." into ics-mr1

commit | commitdiff | tree

Mike Cleron [Tue, 13 Dec 2011 03:27:36 +0000 (19:27 -0800)]

am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1

* commit '3f69fad9e958f867ceaab9c370b97959e3337c50':
Update VIBRATE_ON to a supported value when upgrading from GB.

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 03:04:40 +0000 (19:04 -0800)]

Merge "Minimize the amount of data uploaded to draw text"

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 03:04:32 +0000 (19:04 -0800)]

Merge "Various OpenGL optimizations"

commit | commitdiff | tree

Mike Cleron [Tue, 13 Dec 2011 02:17:46 +0000 (18:17 -0800)]

am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1

* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
Update VIBRATE_ON to a supported value when upgrading from GB.

commit | commitdiff | tree

Mike Cleron [Tue, 13 Dec 2011 02:15:59 +0000 (18:15 -0800)]

Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1

commit | commitdiff | tree

Katherine Kuan [Tue, 13 Dec 2011 02:12:37 +0000 (18:12 -0800)]

Merge "Add logging to country detector logic"

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 02:01:26 +0000 (18:01 -0800)]

am 0ae6e171: am 359bb3b4: Final API 15.

* commit '0ae6e1719b1fc0aee6e5cf690a7005e975d96df9':
Final API 15.

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 02:01:22 +0000 (18:01 -0800)]

am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

* commit '2ad8a89b4b55f1cf8994e5b044d496d889839403':
SDK only: now that support lib is in SDK, we can link to it.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 01:49:31 +0000 (17:49 -0800)]

am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1

* commit '8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
Prevent a memory leak in TextLine.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 01:49:29 +0000 (17:49 -0800)]

am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1

* commit '7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
Text blinking cursor hard to see.

commit | commitdiff | tree

Adam Powell [Tue, 13 Dec 2011 01:49:21 +0000 (17:49 -0800)]

am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1

* commit 'bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 01:04:04 +0000 (17:04 -0800)]

am 359bb3b4: Final API 15.

* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
Final API 15.

commit | commitdiff | tree

Irfan Sheriff [Tue, 13 Dec 2011 00:57:53 +0000 (16:57 -0800)]

am 36838993: Merge "Fix configured network status"

* commit '36838993dfb67a2056468ab74a77a81afa053c9c':
Fix configured network status

commit | commitdiff | tree

Irfan Sheriff [Tue, 13 Dec 2011 00:55:49 +0000 (16:55 -0800)]

Merge "Fix configured network status"

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 00:53:45 +0000 (16:53 -0800)]

am d2ea737a: Merge "Remove leftover debugging code"

* commit 'd2ea737a1f28b43ce2e01686d64a5cf8243daa49':
Remove leftover debugging code

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 00:51:41 +0000 (16:51 -0800)]

am ebb2c6b3: Merge "Keep shaders to render properly"

* commit 'ebb2c6b36da049b32c1dba6f14f16660d860eb09':
Keep shaders to render properly

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 00:50:55 +0000 (16:50 -0800)]

Merge "Remove leftover debugging code"

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 00:49:40 +0000 (16:49 -0800)]

Merge "Keep shaders to render properly"

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 00:16:05 +0000 (16:16 -0800)]

am c1761e7f: Fixed build after merge

* commit 'c1761e7fe10390d90b805f373b51ecaabf214dac':
Fixed build after merge

commit | commitdiff | tree

Jamie Gennis [Tue, 13 Dec 2011 00:13:58 +0000 (16:13 -0800)]

am f08403ba: am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

* commit 'f08403ba92999448512c4af7062fe30206e32dcf':
SurfaceTexture: fix a verbose-log compile error

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 00:12:40 +0000 (16:12 -0800)]

am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
SDK only: now that support lib is in SDK, we can link to it.

commit | commitdiff | tree

Jamie Gennis [Tue, 13 Dec 2011 00:10:28 +0000 (16:10 -0800)]

am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

* commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
SurfaceTexture: fix a verbose-log compile error

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 00:09:54 +0000 (16:09 -0800)]

Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:56:33 +0000 (15:56 -0800)]

am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1

* commit 'a1277de3c393fb0861d26ec5551ae4247e32dee4':
Prevent a memory leak in TextLine.

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:54:38 +0000 (15:54 -0800)]

am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1

* commit '1fb90497b73b1560c55f1cb73cd394c3b8714212':
Text blinking cursor hard to see.

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:53:25 +0000 (15:53 -0800)]

Merge "Prevent a memory leak in TextLine." into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:52:39 +0000 (15:52 -0800)]

Merge "Text blinking cursor hard to see." into ics-mr1

commit | commitdiff | tree

Raphael [Mon, 12 Dec 2011 23:44:16 +0000 (15:44 -0800)]

am b2bf2471: am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit 'b2bf2471b1f0b4a76660e63f91a8de84cc643da8':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.

commit | commitdiff | tree

Matthew Xie [Mon, 12 Dec 2011 23:44:14 +0000 (15:44 -0800)]

am 470d057a: am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit '470d057aedee2f1a8b88a95419f8b1bb42f2120a':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting

commit | commitdiff | tree

Eric Fischer [Mon, 12 Dec 2011 23:44:12 +0000 (15:44 -0800)]

am 74bc6075: am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '74bc6075e13f871a47622d2a08d91b259448a24e':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:44:11 +0000 (15:44 -0800)]

am 8ca8f5ed: am 40375099: Reconcile with ics-mr1-release

* commit '8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9':

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:44:09 +0000 (15:44 -0800)]

am b34027bb: am f14dc291: Merge from ics-mr1

* commit 'b34027bb2fc3394d054986d7bbbcf54261436c11':
Fix drm enumeration order, resolves failure to play forward lock ringtones

commit | commitdiff | tree

Adam Powell [Mon, 12 Dec 2011 23:42:22 +0000 (15:42 -0800)]

am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1

* commit '9c92fcd91c67a98f3a767255e7d3748bca3ef751':
Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect

commit | commitdiff | tree

Adam Powell [Mon, 12 Dec 2011 23:40:00 +0000 (15:40 -0800)]

Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1

commit | commitdiff | tree

Raphael [Mon, 12 Dec 2011 23:39:30 +0000 (15:39 -0800)]

am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.

commit | commitdiff | tree

Matthew Xie [Mon, 12 Dec 2011 23:39:27 +0000 (15:39 -0800)]

am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting

commit | commitdiff | tree

Eric Fischer [Mon, 12 Dec 2011 23:39:23 +0000 (15:39 -0800)]

am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)]

am 40375099: Reconcile with ics-mr1-release

* commit '40375099d10139b6c96c1db8b8295874d60c712e':

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:39:17 +0000 (15:39 -0800)]

am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Dec 2011 23:37:53 +0000 (15:37 -0800)]

am afb847a4: Merge "Clean up synchronization"

* commit 'afb847a4692a6e5cded8c7a330d00b70b794896a':
Clean up synchronization

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Dec 2011 23:35:25 +0000 (15:35 -0800)]

Merge "Clean up synchronization"

commit | commitdiff | tree

Justin Ho [Mon, 12 Dec 2011 23:34:51 +0000 (15:34 -0800)]

am ee8005e6: am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1

* commit 'ee8005e6ecbb95dad98cf1badbeb2b66c794b790':
Quick settings icons updated to match ics style on tablet

commit | commitdiff | tree

Jeff Tinker [Mon, 12 Dec 2011 23:34:49 +0000 (15:34 -0800)]

am a6e54945: am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'a6e549455a17970b5e7b75686d6cc1c7169d59c3':
Fix drm flag setting missed in false drm recognition fix.

commit | commitdiff | tree

Joe Fernandez [Mon, 12 Dec 2011 23:34:47 +0000 (15:34 -0800)]

am 3f6efeaa: am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0

* commit '3f6efeaad72bac766351b91d7c47639ca6d08330':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:34:45 +0000 (15:34 -0800)]

am 0288c6c5: am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1

* commit '0288c6c562bcef5ebeb100d32c1f4083c798573d':
Blinking cursor in Talk

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:34:43 +0000 (15:34 -0800)]

am ac9860bb: am 175d5d76: Reconcile with ics-mr1-release

* commit 'ac9860bb738e6536eb4d89d6a4811e67901c6181':

commit | commitdiff | tree

James Dong [Mon, 12 Dec 2011 23:34:41 +0000 (15:34 -0800)]

am b7e02819: am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit 'b7e0281900db002e9aed8dff0e2fbcd8b22bf91d':
Fixed the false drm recognition.

commit | commitdiff | tree

Justin Ho [Mon, 12 Dec 2011 23:30:36 +0000 (15:30 -0800)]

am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1

* commit 'df83cfc95c1b909ffcfc31f3dd30262a49cffced':
Quick settings icons updated to match ics style on tablet

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:30:25 +0000 (15:30 -0800)]

am 7cb77c1a: resolved conflicts for merge of 1742f20c to master

* commit '7cb77c1a0d86b0fbc8774cd90cc81debc3508be1':
Performance improvements for long text edition.

commit | commitdiff | tree

Jeff Tinker [Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)]

am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
Fix drm flag setting missed in false drm recognition fix.

commit | commitdiff | tree

Joe Fernandez [Mon, 12 Dec 2011 23:30:14 +0000 (15:30 -0800)]

am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0

* commit 'a4f49ac5284d7ab97e56e318523652f35d9de0d6':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:30:10 +0000 (15:30 -0800)]

am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1

* commit 'f107abec56811dea1ae81c6abc78a68e433c1080':
Blinking cursor in Talk

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:29:56 +0000 (15:29 -0800)]

am 175d5d76: Reconcile with ics-mr1-release

* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':

commit | commitdiff | tree

James Dong [Mon, 12 Dec 2011 23:29:46 +0000 (15:29 -0800)]

am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit '406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.

commit | commitdiff | tree

Alex Sakhartchouk [Mon, 12 Dec 2011 23:22:24 +0000 (15:22 -0800)]

Merge "Refactored blur pass code out and added comments." into graphics-dev

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:16:42 +0000 (15:16 -0800)]

resolved conflicts for merge of 1742f20c to master

Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555

commit | commitdiff | tree

Jamie Gennis [Mon, 12 Dec 2011 22:12:33 +0000 (14:12 -0800)]

am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

* commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc':
SurfaceTexture: fix a verbose-log compile error

commit | commitdiff | tree

Jamie Gennis [Mon, 12 Dec 2011 22:10:04 +0000 (14:10 -0800)]

Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

commit | commitdiff | tree

Robert Greenwalt [Mon, 12 Dec 2011 22:04:30 +0000 (14:04 -0800)]

am cc579b89: Merge "Use the carrier-given dns addrs for tethering."

* commit 'cc579b89fc03f404bf42a385dceaebf5060dd327':
Use the carrier-given dns addrs for tethering.

commit | commitdiff | tree

Robert Greenwalt [Mon, 12 Dec 2011 22:02:02 +0000 (14:02 -0800)]

Merge "Use the carrier-given dns addrs for tethering."

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 21:38:24 +0000 (13:38 -0800)]

am 481c0a26: am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1

* commit '481c0a260420a921cdca55130d8d9685d17cf527':
Fixed SpellCheckerSessions leak in TextView

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 21:38:22 +0000 (13:38 -0800)]

am e495cc3f: am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1

* commit 'e495cc3fd9dbf99fcba4f5a65032c6a5c105eeac':
Re-use SpanSets in TextLine

commit | commitdiff | tree

Joe Malin [Mon, 12 Dec 2011 21:38:20 +0000 (13:38 -0800)]

am c789b600: am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0

* commit 'c789b60076aa8ff4b2824ced6c998d667f6945c1':
DOC CHANGE: Package text and Formatter javadoc