1. 39fc0a0 am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. by James Dong · 14 years ago
  2. e6f21ef am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. by James Dong · 14 years ago
  3. 9f3cd71 Merge "Fix bug #5674155 Segmentation issue for Thai" by Fabrice Di Meglio · 14 years ago
  4. 4fba479 Merge "Track scan count by UID" by Irfan Sheriff · 14 years ago
  5. b335110 Merge "Avoid reading network stats when disabled." by Jeff Sharkey · 14 years ago
  6. fd8fdfd Merge "Reduce the number of active texture changes" by Romain Guy · 14 years ago
  7. 03332a0 am 16bdd1e6: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  8. 0ab2a4b Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  9. fc9e209 Merge "Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B" by Fabrice Di Meglio · 14 years ago
  10. d0d85bc Merge "<Insert something improper about OpenGL>" by Romain Guy · 14 years ago
  11. 5dfe8f2 am 1451f598: am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1 by Dirk Dougherty · 14 years ago
  12. 09998b1 am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1 by Dirk Dougherty · 14 years ago
  13. b217721 Merge "Doc change: API diff report for 15." into ics-mr1 by Dirk Dougherty · 14 years ago
  14. bedf00f Merge "Further reduce the number of GL commands sent to the driver" by Romain Guy · 14 years ago
  15. cdc3ed2 resolved conflicts for merge of a80bab37 to master by Dianne Hackborn · 14 years ago
  16. cbe3d5b merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  17. 1aa8e02 am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 by Gilles Debunne · 14 years ago
  18. 990f3c5 am caa8e69a: Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 by Dianne Hackborn · 14 years ago
  19. 8d758ae Merge "TextLayoutCache - fix diacritics composition" by Fabrice Di Meglio · 14 years ago
  20. 1b90c5b Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 by Dianne Hackborn · 14 years ago
  21. 13ef999 Merge "Dump system and secure settings in bugreport." by Amith Yamasani · 14 years ago
  22. aed8f09 am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 by Gilles Debunne · 14 years ago
  23. 8d0b3f3 Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 by Gilles Debunne · 14 years ago
  24. 9ddaf1f Merge "Make glyph cache more flexible" by Chet Haase · 14 years ago
  25. a856aa2 am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 by Dianne Hackborn · 14 years ago
  26. 8ec06aa am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 by Dianne Hackborn · 14 years ago
  27. e46ccbb am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1 by Gilles Debunne · 14 years ago
  28. 75ce709 am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1 by Gilles Debunne · 14 years ago
  29. f3600e5 Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 by Dianne Hackborn · 14 years ago
  30. 366d143 Merge "NPE in GMail / TextLine" into ics-mr1 by Gilles Debunne · 14 years ago
  31. c8e7b72 am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 by Scott Main · 14 years ago
  32. 88aeee3 am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens. by Scott Main · 14 years ago
  33. 18875ae Merge "Reduce the number of GL commands generated by the UI" by Romain Guy · 14 years ago
  34. d0f5b5b am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 by Scott Main · 14 years ago
  35. 95c8297 am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens. by Scott Main · 14 years ago
  36. db20a9b am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 by Scott Main · 14 years ago
  37. 568bf65 am 801fda54: AndroidU lesson on designing for multiple screens. by Scott Main · 14 years ago
  38. f07b37c Merge "Created Android University lesson for Multiple APKs." into ics-mr0 by Scott Main · 14 years ago
  39. c8644da am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 by Andreas Huber · 14 years ago
  40. a0c39d8 am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 by Andreas Huber · 14 years ago
  41. 3ef0a52 Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 by Andreas Huber · 14 years ago
  42. 108c3f0 Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB." by Amith Yamasani · 14 years ago
  43. f51f78d Merge "Re-synced MR1 and master for SpellChecker" by Gilles Debunne · 14 years ago
  44. 43f34c4 Merge "Move ssl callbacks to webcore thread." by Selim Gurun · 14 years ago
  45. 886df70 Merge "Update tilebenchmark to work with current drawing infrastructure" by Chris Craik · 14 years ago
  46. 2b5896d Merge "Changed how Face Unlock coordinates are specified" by Brian Colonna · 14 years ago
  47. daff3b4 am da296533: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  48. fca20c9 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  49. 812cc58 Merge "Add a command option to display installerPackageName" by Ashish Sharma · 14 years ago
  50. 0998dba merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  51. f0d11c3 Merge "Optimize state changes" by Romain Guy · 14 years ago
  52. 788ccf6 am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 by Jeff Sharkey · 14 years ago
  53. 149427a am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 by Jeff Sharkey · 14 years ago
  54. b4d1ec8 Merge "Avoid NPE when missing network stats." into ics-mr1 by Jeff Sharkey · 14 years ago
  55. c5dc473 am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 by Mike Cleron · 14 years ago
  56. 3ee9c0f Merge "Minimize the amount of data uploaded to draw text" by Romain Guy · 14 years ago
  57. 6d390a0 Merge "Various OpenGL optimizations" by Romain Guy · 14 years ago
  58. 24643b6 am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 by Mike Cleron · 14 years ago
  59. ee5de0f Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 by Mike Cleron · 14 years ago
  60. b6d614f Merge "Add logging to country detector logic" by Katherine Kuan · 14 years ago
  61. 3567e61 am 0ae6e171: am 359bb3b4: Final API 15. by Dianne Hackborn · 14 years ago
  62. f9c26a6 am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 by Dianne Hackborn · 14 years ago
  63. a6e265a am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 by Gilles Debunne · 14 years ago
  64. e3b3770 am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 by Gilles Debunne · 14 years ago
  65. a799c5b am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 by Adam Powell · 14 years ago
  66. 76cc3df am 359bb3b4: Final API 15. by Dianne Hackborn · 14 years ago
  67. 53186ed Merge "Fix configured network status" by Irfan Sheriff · 14 years ago
  68. 64f3903 Merge "Remove leftover debugging code" by Romain Guy · 14 years ago
  69. 8d3aace Merge "Keep shaders to render properly" by Romain Guy · 14 years ago
  70. 38478c7 am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 by Dianne Hackborn · 14 years ago
  71. ace62f2 am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 by Jamie Gennis · 14 years ago
  72. ff93486 Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 by Dianne Hackborn · 14 years ago
  73. c8283d3 am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 by Gilles Debunne · 14 years ago
  74. 7d4454c am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 by Gilles Debunne · 14 years ago
  75. 8754c8f Merge "Prevent a memory leak in TextLine." into ics-mr1 by Gilles Debunne · 14 years ago
  76. 8d13810 Merge "Text blinking cursor hard to see." into ics-mr1 by Gilles Debunne · 14 years ago
  77. 42fa601 am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 by Adam Powell · 14 years ago
  78. 3786085 Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 by Adam Powell · 14 years ago
  79. 57f827d am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 by Raphael · 14 years ago
  80. 25e4ab7 am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 by Matthew Xie · 14 years ago
  81. 84e37b2 am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 14 years ago
  82. 0f11d88 am 40375099: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  83. 61d9c58 am f14dc291: Merge from ics-mr1 by The Android Open Source Project · 14 years ago
  84. 313a4b4 Merge "Clean up synchronization" by Irfan Sheriff · 14 years ago
  85. 5efc534 am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 by Justin Ho · 14 years ago
  86. 889fd1b am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 by Jeff Tinker · 14 years ago
  87. 621cb67 am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 by Joe Fernandez · 14 years ago
  88. e5d55e7 am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 by Gilles Debunne · 14 years ago
  89. 29f50c0 am 175d5d76: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  90. c77a730 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. by James Dong · 14 years ago
  91. b0332ef resolved conflicts for merge of 1742f20c to master by Gilles Debunne · 14 years ago
  92. 51ce74d am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 by Jamie Gennis · 14 years ago
  93. 07584d6 Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 by Jamie Gennis · 14 years ago
  94. b947b40 Merge "Use the carrier-given dns addrs for tethering." by Robert Greenwalt · 14 years ago
  95. 65e3a8c am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 by Raphael · 14 years ago
  96. 0bc83f2 am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 by Gilles Debunne · 14 years ago
  97. df7e6c5 am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 by Gilles Debunne · 14 years ago
  98. aa93289 am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 by Joe Malin · 14 years ago
  99. 168eaf1 am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 by Chia-chi Yeh · 14 years ago
  100. afcfa2f Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 by Raphael · 14 years ago