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

Romain Guy [Thu, 15 Dec 2011 18:07:33 +0000 (10:07 -0800)]

am 8a5f8ba4: Merge "Further reduce the number of GL commands sent to the driver"

* commit '8a5f8ba4f3e8352155c711adb649e6f536d194b5':
Further reduce the number of GL commands sent to the driver

commit | commitdiff | tree

Dianne Hackborn [Thu, 15 Dec 2011 18:07:25 +0000 (10:07 -0800)]

am b5052de7: resolved conflicts for merge of a80bab37 to master

* commit 'b5052de75736527549d7e537632777c6fec2e4f0':
Fix issue #5756204: Crespo IME briefly appears shortened when...

commit | commitdiff | tree

Alex Sakhartchouk [Wed, 14 Dec 2011 23:11:14 +0000 (15:11 -0800)]

Merge "make loading assets more robust" into graphics-dev

commit | commitdiff | tree

Romain Guy [Wed, 14 Dec 2011 01:29:42 +0000 (17:29 -0800)]

Merge "Further reduce the number of GL commands sent to the driver"

commit | commitdiff | tree

Alex Sakhartchouk [Wed, 14 Dec 2011 01:11:32 +0000 (17:11 -0800)]

Merge "Rename some elements to be more in line with rest of framework." into graphics-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 14 Dec 2011 00:31:43 +0000 (16:31 -0800)]

resolved conflicts for merge of a80bab37 to master

Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef

commit | commitdiff | tree

Gilles Debunne [Wed, 14 Dec 2011 00:02:18 +0000 (16:02 -0800)]

am 6e87ecbb: am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1

* commit '6e87ecbb1db883aa60aeb37b059f066974220d2b':
Do not spell check the foreground ExtractEditText.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 23:59:26 +0000 (15:59 -0800)]

am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1

* commit '2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
Do not spell check the foreground ExtractEditText.

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 13 Dec 2011 23:44:30 +0000 (15:44 -0800)]

am b5048bce: Merge "TextLayoutCache - fix diacritics composition"

* commit 'b5048bceebf1ada63a18fce0b5d9fbe2dd6c0351':
TextLayoutCache - fix diacritics composition

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 23:41:54 +0000 (15:41 -0800)]

am caa8e69a: Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1

* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
Fix issue #5756204: Crespo IME briefly appears shortened when...

commit | commitdiff | tree

Amith Yamasani [Tue, 13 Dec 2011 23:41:51 +0000 (15:41 -0800)]

am 513e14e3: Merge "Dump system and secure settings in bugreport."

* commit '513e14e31627430f3198d56a4a9c6336a5a058a6':
Dump system and secure settings in bugreport.

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 13 Dec 2011 23:41:47 +0000 (15:41 -0800)]

Merge "TextLayoutCache - fix diacritics composition"

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 23:40:18 +0000 (15:40 -0800)]

Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Tue, 13 Dec 2011 23:39:17 +0000 (15:39 -0800)]

Merge "Dump system and secure settings in bugreport."

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 23:38:43 +0000 (15:38 -0800)]

am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1

* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
Do not spell check the foreground ExtractEditText.

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 23:36:48 +0000 (15:36 -0800)]

Merge "Do not spell check the foreground ExtractEditText." into ics-mr1

commit | commitdiff | tree

Alex Sakhartchouk [Tue, 13 Dec 2011 23:24:48 +0000 (15:24 -0800)]

Merge "Properly detecting blending case." into graphics-dev

commit | commitdiff | tree

Chet Haase [Tue, 13 Dec 2011 22:29:06 +0000 (14:29 -0800)]

am e829bc0f: Merge "Make glyph cache more flexible"

* commit 'e829bc0f0364e942bed01536d115a5c08d25d776':
Make glyph cache more flexible

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 22:29:03 +0000 (14:29 -0800)]

am ee4d45f3: am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1

* commit 'ee4d45f3052c8d339035c4bb8eca9b7a724e5074':
Fix issue #5755172: Soft menu key disappears when menu is open

commit | commitdiff | tree

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

am 78efa026: am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1

* commit '78efa026c7b5e7bcd06ab1f58ccd024366687cd3':
NPE in GMail / TextLine

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 22:28:51 +0000 (14:28 -0800)]

am 09bd7978: am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0

* commit '09bd797895a0c549186454f6a0274bc402e95581':
Created Android University lesson for Multiple APKs.

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 22:28:49 +0000 (14:28 -0800)]

am 71786dd1: am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.

* commit '71786dd191b899a6121d1a0d2a3a4544db1a91a6':
AndroidU lesson on designing for multiple screens.

commit | commitdiff | tree

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

Chet Haase [Tue, 13 Dec 2011 22:03:43 +0000 (14:03 -0800)]

Merge "Make glyph cache more flexible"

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 21:44:14 +0000 (13:44 -0800)]

am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1

* commit '0be53567c1c2299c548d3204d2b9240108fbd53a':
Fix issue #5755172: Soft menu key disappears when menu is open

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]

am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1

* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
Fix issue #5755172: Soft menu key disappears when menu is open

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]

am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1

* commit '0d3a5e4cbddc9a6a0a551698b5152c815842952a':
NPE in GMail / TextLine

commit | commitdiff | tree

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

am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1

* commit '67d54ac017494229eed27a184159461d63201a9f':
NPE in GMail / TextLine

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Dec 2011 21:38:56 +0000 (13:38 -0800)]

Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 21:37:29 +0000 (13:37 -0800)]

Merge "NPE in GMail / TextLine" into ics-mr1

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 21:15:27 +0000 (13:15 -0800)]

am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0

* commit '9a8e7afc53e39e22664c77b3ca6f1a59aac36ee3':
Created Android University lesson for Multiple APKs.

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 21:15:25 +0000 (13:15 -0800)]

am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.

* commit '04c6e62ce4750beb617eb6e4e9cadfd631bfe824':
AndroidU lesson on designing for multiple screens.

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

Scott Main [Tue, 13 Dec 2011 21:13:15 +0000 (13:13 -0800)]

am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0

* commit 'c9295b2069af6530fba37a16c88757acaaff63e8':
Created Android University lesson for Multiple APKs.

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 21:13:07 +0000 (13:13 -0800)]

am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.

* commit '37191e1dc783a5558eb8ee4f096bd8350c34415d':
AndroidU lesson on designing for multiple screens.

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 21:10:45 +0000 (13:10 -0800)]

am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0

* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 21:10:42 +0000 (13:10 -0800)]

am 801fda54: AndroidU lesson on designing for multiple screens.

* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.

commit | commitdiff | tree

Scott Main [Tue, 13 Dec 2011 20:25:38 +0000 (12:25 -0800)]

Merge "Created Android University lesson for Multiple APKs." into ics-mr0

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