1. 094cf42 Merge "Remove dead setRingerMode(mode, mask)" by Glenn Kasten · 14 years ago
  2. 64dc252 Merge "Fix build warning for void * arithmetic" by Glenn Kasten · 14 years ago
  3. 7298271 Merge "Fixes some javadoc." by Pin Ting · 14 years ago
  4. 3e43730 Merge "Don't need to link to libsqlite from media JNI library." by Jeff Brown · 14 years ago
  5. eaec3d7 Merge "Clean up SQLiteDebug natives." by Jeff Brown · 14 years ago
  6. 0a2df49 Merge "Remove custom SQLITE_UNCLOSED error code." by Jeff Brown · 14 years ago
  7. 7e16e90 Merge "Remove obsolete TODO comments" by James Dong · 14 years ago
  8. 9e99429 Merge "Fix build" by Romain Guy · 14 years ago
  9. 2e47bf1 Merge "Remove unused code" by Romain Guy · 14 years ago
  10. 644a236 Merge "Deprecate unused APIs" by Romain Guy · 14 years ago
  11. 562c9c9 Merge "Make sure the ThrottledSource reports the proper mime type" by Andreas Huber · 14 years ago
  12. 42d63bd Merge "Remove no longer needed EventHub usleep() optimization." by Jeff Brown · 14 years ago
  13. 00e188c Merge "Fix line wrapping." by Jeff Brown · 14 years ago
  14. 4cebd4a Merge "Clean up SQLite debugging code." by Jeff Brown · 14 years ago
  15. 3e71b25 Merge "Fix broken drawCircle LayoutLib." by Xavier Ducrohet · 14 years ago
  16. 6739817 Merge "resolved conflicts for merge of 05683c85 to master" by Eric Laurent · 14 years ago
  17. 273b8d5 Merge "Touch slop added to double tap detection" by Gilles Debunne · 14 years ago
  18. b77ca45 Merge "Fixes around extract mode" by Gilles Debunne · 14 years ago
  19. 0fa934f Merge "Support full screen back to back playing using javascript" by Teng-Hui Zhu · 14 years ago
  20. b64e824 resolved conflicts for merge of 05683c85 to master by Eric Laurent · 14 years ago
  21. 341cf00 Merge "Fix incorrect includes of AudioTrack.h" by Glenn Kasten · 14 years ago
  22. 01d2a7f Merge "Simplify range check for audio_mode_t (continued)" by Glenn Kasten · 14 years ago
  23. 00e560c Merge "Add units to time periods" by Glenn Kasten · 14 years ago
  24. 8392e1a Merge "Use const const strings for arrays and pointers to strings" by Glenn Kasten · 14 years ago
  25. 23506b6 Merge "For booleans, use ! instead of == false" by Glenn Kasten · 14 years ago
  26. fb06f08 Merge "Replace run-time stream types by compile-time" by Glenn Kasten · 14 years ago
  27. 81e215f Merge "Fix issues with reentrant SQLite triggers." by Jeff Brown · 14 years ago
  28. f1c2f9a Merge "Add basic code required for drawPicture()" by Romain Guy · 14 years ago
  29. 3ed5198 Merge "Don't crash on Canvas.drawPicture()" by Romain Guy · 14 years ago
  30. 6c05083 Merge "Full support for Canvas.drawPosText" by Romain Guy · 14 years ago
  31. bf927a0 am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
  32. 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
  33. 033c95c Merge "Fix edge cases leading to backup hanging forever" by Christopher Tate · 14 years ago
  34. 0f467dc am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 by Wink Saville · 14 years ago
  35. 3571f22 Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
  36. 9b4e98a Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 by Wink Saville · 14 years ago
  37. f724170 Merge "Run ComputePerf multiple times." by Stephen Hines · 14 years ago
  38. 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
  39. 589629d am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 by Adam Powell · 14 years ago
  40. 9d40d1e Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 by Adam Powell · 14 years ago
  41. 8377e59 Merge "Improve heuristics for orientation detection." by Jeff Brown · 14 years ago
  42. b86560d Merge "Prevent IME from popping up on startup" by Michael Kolb · 14 years ago
  43. 93ddcfd am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 by Robert Ly · 14 years ago
  44. 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
  45. 3d515c3 am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 by Robert Ly · 14 years ago
  46. 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
  47. 103e203 Merge "docs: adding rs api docs" into ics-mr1 by Robert Ly · 14 years ago
  48. 140608d Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 by Robert Ly · 14 years ago
  49. 5144ffd Merge "Remove LlcpPacket from public namespace." by Martijn Coenen · 14 years ago
  50. 66558b5 am 58f9c3da: am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 by Joe Fernandez · 14 years ago
  51. 629e3a4 am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 by Joe Fernandez · 14 years ago
  52. 617d0b0 Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 by Joe Fernandez · 14 years ago
  53. b457eff Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures" by Andreas Huber · 14 years ago
  54. 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
  55. 9644a67 Merge "Make sure seek triggers a reconnect if needed." by Bryan Mawhinney · 14 years ago
  56. 628a011 Merge "Track volume cleanup" by Glenn Kasten · 14 years ago
  57. b202c1b Merge "First pass at implementing Canvas.drawPosText() in GL" by Romain Guy · 14 years ago
  58. e2f3dcc Merge "audio framework: manage stream volume per device" by Eric Laurent · 14 years ago
  59. 6843f25 Merge "Free optimization" by Romain Guy · 14 years ago
  60. 09f7079 Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes." by Svetoslav Ganov · 14 years ago
  61. dfdf412 Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions" by Tadashi G. Takaoka · 14 years ago
  62. 9ac2f3c Merge "Support javascript to exit full screen video." by Teng-Hui Zhu · 14 years ago
  63. 14d3742 Merge "Hinting RemoteViewsAdapter as to which views are visible" by Adam Cohen · 14 years ago
  64. bb81c3e Merge "Check if View's alpha must be updated in setter" by Michael Jurka · 14 years ago
  65. 87dd212 Merge "Fix text encoding when drawing with drawPosText in software" by Romain Guy · 14 years ago
  66. 4d903d5 Merge "Fix build warnings" by Glenn Kasten · 14 years ago
  67. edbb934 Merge "Remove dead setVolume() and mVolume[2]" by Glenn Kasten · 14 years ago
  68. d0a48a2 Merge "Move fixed_fft to system/media/audio_utils" by Glenn Kasten · 14 years ago
  69. dd9dd44 Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers" by Siva Velusamy · 14 years ago
  70. 22dde6d Merge "Fix bug where recents stopped showing up" by Michael Jurka · 14 years ago
  71. 34c726e gltrace: fixup data for glTexSubImage2D & glDeleteBuffers by Siva Velusamy · 14 years ago
  72. 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
  73. 1d26532 Merge "Use audio_mode_t consistently" by Glenn Kasten · 14 years ago
  74. ccb0d76 Merge "Improve GLES20Canvas clip support" by Romain Guy · 14 years ago
  75. 0ebc950 Merge "Rename Visualizer::mLock" by Glenn Kasten · 14 years ago
  76. 8ffaf7f Merge "Document update for WebView user to support HTML5 video" by Teng-Hui Zhu · 14 years ago
  77. c27148e Merge "Expand WebKitHitTest and do some preliminary caching" by John Reck · 14 years ago
  78. bc550da Merge "Fix locking for mMasterVolume and mMute" by Glenn Kasten · 14 years ago
  79. 01317c2 Merge "Use size_t for frame size" by Glenn Kasten · 14 years ago
  80. b8105e3 Merge "Use audio_stream_type_t consistently" by Glenn Kasten · 14 years ago
  81. 6447aa8 Merge "Add android.os.Process.setThreadScheduler" by Glenn Kasten · 14 years ago
  82. 380cdee Merge "AudioTrack and AudioFlinger send level cleanup" by Glenn Kasten · 14 years ago
  83. 5b941c3 am 2afcd2d1: am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 by Scott Main · 14 years ago
  84. 2b43326 am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 by Scott Main · 14 years ago
  85. e0edc5b am 114875e8: am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 by Scott Main · 14 years ago
  86. 8d9c020 am d4d68fe2: am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 by Dianne Hackborn · 14 years ago
  87. aefd164 am 80c4cd1f: am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 by Daniel Sandler · 14 years ago
  88. 37a79cf Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 by Scott Main · 14 years ago
  89. 3d66c69 am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 by Scott Main · 14 years ago
  90. 1f7dba4 am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 by Dianne Hackborn · 14 years ago
  91. f176920 am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 by Daniel Sandler · 14 years ago
  92. 3d3293b Merge "docs: mention x86 as a native platform filter" into ics-mr1 by Scott Main · 14 years ago
  93. 5098fcc Merge "cleanup for concurrency" by Irfan Sheriff · 14 years ago
  94. 55f960f Merge "Update notification documentation to follow current guidelines." into ics-mr1 by Dianne Hackborn · 14 years ago
  95. 6168fe0 Merge "fix layer scrollbar updates" by Michael Kolb · 14 years ago
  96. 1be4719 Merge "Introduce FileRotator." by Jeff Sharkey · 14 years ago
  97. fcc24a5 Merge "Fix compilation with Clang." by Jeff Brown · 14 years ago
  98. 43f0a8a Merge "Fix a few memory leaks in the input dispatcher." by Jeff Brown · 14 years ago
  99. 80ec198 Merge "Sub display list in TextView" by Gilles Debunne · 14 years ago
  100. 91e6d9c Merge "media/mtp: Add missing LOCAL_C_INCLUDES" by David 'Digit' Turner · 14 years ago