1. 045b505 am 5d0c713a: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  2. 0a1cd6f am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 by Robert Ly · 14 years ago
  3. 237c720 am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 by Jim Miller · 14 years ago
  4. 4987135 Merge "Fix warning for redundant typedef" by Glenn Kasten · 14 years ago
  5. 81acea1 Merge "Stop using shared DUN APN when tethering stops." by Robert Greenwalt · 14 years ago
  6. 39d2224 Merge "Add ANativeWindow timestamp support to camera service." by Eino-Ville Talvala · 14 years ago
  7. d1a7460 Merge "Log netd traffic nicely." by Robert Greenwalt · 14 years ago
  8. b1ea19c Merge "Initialize SQLite as part of the android runtime." by Jeff Brown · 14 years ago
  9. 43414fb Merge "Touch moves cursor in text refactored" by Gilles Debunne · 14 years ago
  10. 3b03ffe Merge "Starhub RTSP apparently does not establish time on all tracks" by Andreas Huber · 14 years ago
  11. 8cfd833 Merge "Fix typos in string constants" by Glenn Kasten · 14 years ago
  12. 43e5bc5 Merge "Remove dead file include/media/thread_init.h" by Glenn Kasten · 14 years ago
  13. c7a184d Merge "Remove redundant get()" by Glenn Kasten · 14 years ago
  14. 2a216a4 Merge "Move memcpy_to_i16_from_u8 to audio_utils" by Glenn Kasten · 14 years ago
  15. 0c62715 Merge "AOOB in AutoComplete" by Gilles Debunne · 14 years ago
  16. 9341357 Merge "Make sure text selection always starts" by Gilles Debunne · 14 years ago
  17. 094cf42 Merge "Remove dead setRingerMode(mode, mask)" by Glenn Kasten · 14 years ago
  18. 64dc252 Merge "Fix build warning for void * arithmetic" by Glenn Kasten · 14 years ago
  19. 7298271 Merge "Fixes some javadoc." by Pin Ting · 14 years ago
  20. 3e43730 Merge "Don't need to link to libsqlite from media JNI library." by Jeff Brown · 14 years ago
  21. eaec3d7 Merge "Clean up SQLiteDebug natives." by Jeff Brown · 14 years ago
  22. 0a2df49 Merge "Remove custom SQLITE_UNCLOSED error code." by Jeff Brown · 14 years ago
  23. 7e16e90 Merge "Remove obsolete TODO comments" by James Dong · 14 years ago
  24. 9e99429 Merge "Fix build" by Romain Guy · 14 years ago
  25. 2e47bf1 Merge "Remove unused code" by Romain Guy · 14 years ago
  26. 644a236 Merge "Deprecate unused APIs" by Romain Guy · 14 years ago
  27. 562c9c9 Merge "Make sure the ThrottledSource reports the proper mime type" by Andreas Huber · 14 years ago
  28. 42d63bd Merge "Remove no longer needed EventHub usleep() optimization." by Jeff Brown · 14 years ago
  29. 00e188c Merge "Fix line wrapping." by Jeff Brown · 14 years ago
  30. 4cebd4a Merge "Clean up SQLite debugging code." by Jeff Brown · 14 years ago
  31. 3e71b25 Merge "Fix broken drawCircle LayoutLib." by Xavier Ducrohet · 14 years ago
  32. 06449fb Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  33. 6739817 Merge "resolved conflicts for merge of 05683c85 to master" by Eric Laurent · 14 years ago
  34. 52bd79f am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 by Robert Ly · 14 years ago
  35. 90bb222 am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 by Robert Ly · 14 years ago
  36. 75991b5 Merge "docs: wifi direct" into ics-mr0 by Robert Ly · 14 years ago
  37. 273b8d5 Merge "Touch slop added to double tap detection" by Gilles Debunne · 14 years ago
  38. b77ca45 Merge "Fixes around extract mode" by Gilles Debunne · 14 years ago
  39. 0fa934f Merge "Support full screen back to back playing using javascript" by Teng-Hui Zhu · 14 years ago
  40. b64e824 resolved conflicts for merge of 05683c85 to master by Eric Laurent · 14 years ago
  41. 341cf00 Merge "Fix incorrect includes of AudioTrack.h" by Glenn Kasten · 14 years ago
  42. 01d2a7f Merge "Simplify range check for audio_mode_t (continued)" by Glenn Kasten · 14 years ago
  43. 00e560c Merge "Add units to time periods" by Glenn Kasten · 14 years ago
  44. 8392e1a Merge "Use const const strings for arrays and pointers to strings" by Glenn Kasten · 14 years ago
  45. 23506b6 Merge "For booleans, use ! instead of == false" by Glenn Kasten · 14 years ago
  46. fb06f08 Merge "Replace run-time stream types by compile-time" by Glenn Kasten · 14 years ago
  47. 73ca18b merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  48. 81e215f Merge "Fix issues with reentrant SQLite triggers." by Jeff Brown · 14 years ago
  49. f1c2f9a Merge "Add basic code required for drawPicture()" by Romain Guy · 14 years ago
  50. 3ed5198 Merge "Don't crash on Canvas.drawPicture()" by Romain Guy · 14 years ago
  51. 6c05083 Merge "Full support for Canvas.drawPosText" by Romain Guy · 14 years ago
  52. 8962170 am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 by Jim Miller · 14 years ago
  53. b82dd31 Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 by Jim Miller · 14 years ago
  54. bf927a0 am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
  55. 78b9b6f am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 by Wink Saville · 14 years ago
  56. 033c95c Merge "Fix edge cases leading to backup hanging forever" by Christopher Tate · 14 years ago
  57. 0f467dc am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 by Wink Saville · 14 years ago
  58. 3571f22 Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
  59. 9b4e98a Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 by Wink Saville · 14 years ago
  60. f724170 Merge "Run ComputePerf multiple times." by Stephen Hines · 14 years ago
  61. 947a9a0 am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 by Adam Powell · 14 years ago
  62. 589629d am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 by Adam Powell · 14 years ago
  63. 9d40d1e Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 by Adam Powell · 14 years ago
  64. 8377e59 Merge "Improve heuristics for orientation detection." by Jeff Brown · 14 years ago
  65. b86560d Merge "Prevent IME from popping up on startup" by Michael Kolb · 14 years ago
  66. 93ddcfd am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 by Robert Ly · 14 years ago
  67. ee53741 am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 by Robert Ly · 14 years ago
  68. 3d515c3 am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 by Robert Ly · 14 years ago
  69. 75aa731 am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 by Robert Ly · 14 years ago
  70. 103e203 Merge "docs: adding rs api docs" into ics-mr1 by Robert Ly · 14 years ago
  71. 140608d Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 by Robert Ly · 14 years ago
  72. 5144ffd Merge "Remove LlcpPacket from public namespace." by Martijn Coenen · 14 years ago
  73. 66558b5 am 58f9c3da: am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 by Joe Fernandez · 14 years ago
  74. 629e3a4 am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 by Joe Fernandez · 14 years ago
  75. 617d0b0 Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 by Joe Fernandez · 14 years ago
  76. b457eff Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures" by Andreas Huber · 14 years ago
  77. e75d488 Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)" by Andreas Huber · 14 years ago
  78. 9644a67 Merge "Make sure seek triggers a reconnect if needed." by Bryan Mawhinney · 14 years ago
  79. 628a011 Merge "Track volume cleanup" by Glenn Kasten · 14 years ago
  80. b202c1b Merge "First pass at implementing Canvas.drawPosText() in GL" by Romain Guy · 14 years ago
  81. e2f3dcc Merge "audio framework: manage stream volume per device" by Eric Laurent · 14 years ago
  82. 6843f25 Merge "Free optimization" by Romain Guy · 14 years ago
  83. 09f7079 Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes." by Svetoslav Ganov · 14 years ago
  84. dfdf412 Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions" by Tadashi G. Takaoka · 14 years ago
  85. 9ac2f3c Merge "Support javascript to exit full screen video." by Teng-Hui Zhu · 14 years ago
  86. 14d3742 Merge "Hinting RemoteViewsAdapter as to which views are visible" by Adam Cohen · 14 years ago
  87. bb81c3e Merge "Check if View's alpha must be updated in setter" by Michael Jurka · 14 years ago
  88. 87dd212 Merge "Fix text encoding when drawing with drawPosText in software" by Romain Guy · 14 years ago
  89. 4d903d5 Merge "Fix build warnings" by Glenn Kasten · 14 years ago
  90. edbb934 Merge "Remove dead setVolume() and mVolume[2]" by Glenn Kasten · 14 years ago
  91. d0a48a2 Merge "Move fixed_fft to system/media/audio_utils" by Glenn Kasten · 14 years ago
  92. dd9dd44 Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers" by Siva Velusamy · 14 years ago
  93. 22dde6d Merge "Fix bug where recents stopped showing up" by Michael Jurka · 14 years ago
  94. 34c726e gltrace: fixup data for glTexSubImage2D & glDeleteBuffers by Siva Velusamy · 14 years ago
  95. b714a5b Merge "Fix bug #5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points" by Fabrice Di Meglio · 14 years ago
  96. 1d26532 Merge "Use audio_mode_t consistently" by Glenn Kasten · 14 years ago
  97. ccb0d76 Merge "Improve GLES20Canvas clip support" by Romain Guy · 14 years ago
  98. 0ebc950 Merge "Rename Visualizer::mLock" by Glenn Kasten · 14 years ago
  99. 8ffaf7f Merge "Document update for WebView user to support HTML5 video" by Teng-Hui Zhu · 14 years ago
  100. c27148e Merge "Expand WebKitHitTest and do some preliminary caching" by John Reck · 14 years ago