1. 02d37b9 resolved conflicts for merge of 892d11f4 to master by Dianne Hackborn · 13 years ago
  2. 65f87ec Merge "Fix shared-storage full backup" by Christopher Tate · 13 years ago
  3. 73d7369 Fix shared-storage full backup by Christopher Tate · 13 years ago
  4. 0f73d75 Merge "Remove AudioFlinger dependencies on client" by Glenn Kasten · 13 years ago
  5. 34f9f8b Remove AudioFlinger dependencies on client by Glenn Kasten · 13 years ago
  6. 7a640a0 Merge "Revert "Use port 18000 instead of 8000 for layout tests"" by Guang Zhu · 13 years ago
  7. d467347 Revert "Use port 18000 instead of 8000 for layout tests" by Guang Zhu · 13 years ago
  8. e0e10b4 am a64f899f: am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 by Daniel Sandler · 13 years ago
  9. 2af9ecf am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 by Jeff Brown · 13 years ago
  10. 8552b4a am 06a0fb95: (-s ours) am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 by Jeff Brown · 13 years ago
  11. 32f17ee am 288cde7f: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  12. ba4ea76 am ee567e08: am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 13 years ago
  13. 1e5b88f am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 13 years ago
  14. 152e173 am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 13 years ago
  15. d4e936b am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 13 years ago
  16. 20a34b5 am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 13 years ago
  17. 62a8954 am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc by Jean-Baptiste Queru · 13 years ago
  18. da535e7 am fd266b36: (-s ours) am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" by Jean-Baptiste Queru · 13 years ago
  19. d1e83e4 am abc90a7b: (-s ours) am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 by Justin Ho · 13 years ago
  20. 8bef9cb Merge "Delete dead code." by Jeff Brown · 13 years ago
  21. bd4c9f1 Delete dead code. by Jeff Brown · 13 years ago
  22. 1879813 Merge "Additional logging information for Card Application Toolkit/SIM Toolkit" by Wink Saville · 13 years ago
  23. 96d58cf am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 by Robert Ly · 13 years ago
  24. 9ace027 am 5d0c713a: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  25. a551fee am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 by Robert Ly · 13 years ago
  26. ea7527e Additional logging information for Card Application Toolkit/SIM Toolkit by Wink Saville · 13 years ago
  27. d3fe9ab am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 by Jim Miller · 13 years ago
  28. 865534a Merge "Fix warning for redundant typedef" by Glenn Kasten · 13 years ago
  29. 0a204ed Use audio_format_t consistently, continued by Glenn Kasten · 13 years ago
  30. 2772143 Merge "Stop using shared DUN APN when tethering stops." by Robert Greenwalt · 13 years ago
  31. 59734cb Merge "Add ANativeWindow timestamp support to camera service." by Eino-Ville Talvala · 13 years ago
  32. 67d853b Merge "Log netd traffic nicely." by Robert Greenwalt · 13 years ago
  33. 1bf599a Merge "Initialize SQLite as part of the android runtime." by Jeff Brown · 13 years ago
  34. 2f9510c Merge "Touch moves cursor in text refactored" by Gilles Debunne · 13 years ago
  35. e8bb6fe Merge "Starhub RTSP apparently does not establish time on all tracks" by Andreas Huber · 13 years ago
  36. 475334f Starhub RTSP apparently does not establish time on all tracks by Andreas Huber · 13 years ago
  37. 4b57553 Initialize SQLite as part of the android runtime. by Jeff Brown · 13 years ago
  38. c79e413 Merge "Fix typos in string constants" by Glenn Kasten · 13 years ago
  39. 15f51cc Merge "Remove dead file include/media/thread_init.h" by Glenn Kasten · 13 years ago
  40. ea46649 Merge "Remove redundant get()" by Glenn Kasten · 13 years ago
  41. 892d11f am 1bae8066: Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 by Dianne Hackborn · 13 years ago
  42. 1bae806 Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 by Dianne Hackborn · 13 years ago
  43. 5ecff09 Merge "Move memcpy_to_i16_from_u8 to audio_utils" by Glenn Kasten · 13 years ago
  44. 70ed6b7 Remove redundant get() by Glenn Kasten · 13 years ago
  45. a64f899 am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 by Daniel Sandler · 13 years ago
  46. 4d3161f Merge "Always show appropriate mobile service label." into ics-mr1 by Daniel Sandler · 13 years ago
  47. 1bc8279 am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 by Jeff Brown · 13 years ago
  48. 06a0fb9 am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 by Jeff Brown · 13 years ago
  49. ad1f4a2 Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 by Jeff Brown · 13 years ago
  50. 5d58eb0 Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 by Jeff Brown · 13 years ago
  51. 5eaa0f6 Fix warning for redundant typedef by Glenn Kasten · 13 years ago
  52. cfbf7de Fix issue #5823276 again: home repaints after full-screen app is exited by Dianne Hackborn · 13 years ago
  53. 470fd72 Log netd traffic nicely. by Robert Greenwalt · 13 years ago
  54. 1d98303 Merge "AOOB in AutoComplete" by Gilles Debunne · 13 years ago
  55. 7418c35 Merge "Make sure text selection always starts" by Gilles Debunne · 13 years ago
  56. 288cde7 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  57. 7524a59 Merge "Remove dead setRingerMode(mode, mask)" by Glenn Kasten · 13 years ago
  58. 1b4d604 Merge "Fix build warning for void * arithmetic" by Glenn Kasten · 13 years ago
  59. f17e7c2 Merge "Fixes some javadoc." by Pin Ting · 13 years ago
  60. 8592baa Merge "Don't need to link to libsqlite from media JNI library." by Jeff Brown · 13 years ago
  61. 46deab0 Merge "Clean up SQLiteDebug natives." by Jeff Brown · 13 years ago
  62. b815d0f Merge "Remove custom SQLITE_UNCLOSED error code." by Jeff Brown · 13 years ago
  63. 20c53cb Merge "Remove obsolete TODO comments" by James Dong · 13 years ago
  64. 22d4184 Fix the build, for real by Romain Guy · 13 years ago
  65. 90bd187 Merge "Fix build" by Romain Guy · 13 years ago
  66. 6544728 Fix build by Romain Guy · 13 years ago
  67. 05bd7b5 Don't need to link to libsqlite from media JNI library. by Jeff Brown · 13 years ago
  68. 254fba8 Clean up SQLiteDebug natives. by Jeff Brown · 13 years ago
  69. d2f0dcd Merge "Remove unused code" by Romain Guy · 13 years ago
  70. 68fc1df Remove unused code by Romain Guy · 13 years ago
  71. 92db519 Make sure text selection always starts by Gilles Debunne · 13 years ago
  72. bad1216 Merge "Deprecate unused APIs" by Romain Guy · 13 years ago
  73. ee567e0 am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 13 years ago
  74. 4547055 am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 13 years ago
  75. db2b393 am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 13 years ago
  76. dde686e am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 13 years ago
  77. a1e8739 am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 13 years ago
  78. c3c36b4f am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 13 years ago
  79. 12b7da6 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 13 years ago
  80. f3f650d am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 13 years ago
  81. 08d3c6e am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 13 years ago
  82. 7ae8420 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 13 years ago
  83. 32f4700 Always show appropriate mobile service label. by Kazuhiro Ondo · 13 years ago
  84. d6b5584b am 97aa8ee8: Merge ee4618bc by Jean-Baptiste Queru · 13 years ago
  85. 97aa8ee Merge ee4618bc by Jean-Baptiste Queru · 13 years ago
  86. f9d9c06 Deprecate unused APIs by Romain Guy · 13 years ago
  87. e1103cf Remove obsolete TODO comments by James Dong · 13 years ago
  88. fd266b3 am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" by Jean-Baptiste Queru · 13 years ago
  89. 36b48c3 am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" by Jean-Baptiste Queru · 13 years ago
  90. 48a4789 Remove custom SQLITE_UNCLOSED error code. by Jeff Brown · 13 years ago
  91. a5530a8 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  92. abc90a7 am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 by Justin Ho · 13 years ago
  93. 820b45c Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 by Justin Ho · 13 years ago
  94. 170997a DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited" by Justin Ho · 13 years ago
  95. 9d25b82 Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 13 years ago
  96. 6df477b Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 13 years ago
  97. a826f9e Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 13 years ago
  98. 4f367f3 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 13 years ago
  99. ba7f0d2 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 13 years ago
  100. ee4618b Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" by Jean-Baptiste Queru · 13 years ago