1. 83dfb06 Merge changes I08fcd278,I1f496bb7 by Craig Mautner · 13 years ago
  2. 5a8a89a Merge "Add test for signed/unsigned char bug (conversion)." by Stephen Hines · 13 years ago
  3. aa806be Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext." by James Dong · 13 years ago
  4. ab2acab Merge "InputConnection is warned when finished" by Gilles Debunne · 13 years ago
  5. 5a0f8ef Merge "Unblock IPC call in TextServicesManagerService" by satok · 13 years ago
  6. 674ecfe Merge "Update AndroidEmoji to version 1.01" by Bart Sears · 13 years ago
  7. 08a79a8 am 246a1bee: am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  8. ccc9c44 am 61a9a83a: am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  9. 8d0932d am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  10. 05e2153 am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  11. b8dea50 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  12. 5cecb55 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  13. b39e385 Merge "fix bug 5911175" into ics-mr1 by Robert Ly · 13 years ago
  14. 8ac1332 Merge "Removed TextAlign in TextView" by Gilles Debunne · 13 years ago
  15. 7909575 am 11f343c6: am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  16. da2e989 am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  17. c38ba57 Merge "Disable verbose NetworkStats logging." by Jeff Sharkey · 13 years ago
  18. 15009e3 am 4953ec1c: am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  19. 731757c am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  20. a196c91 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  21. 173e455 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  22. 0003f91 Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 by Dianne Hackborn · 13 years ago
  23. ee614e7 am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) by felipeal · 13 years ago
  24. d378afb am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) by felipeal · 13 years ago
  25. 9f841a4 am ccd08b8d: am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" by Jean-Baptiste Queru · 13 years ago
  26. 564a380 Merge "Add shortcut for voice search" by Michael Jurka · 13 years ago
  27. 09804e4 Merge "Fix API issues in DrmRights class." by James Dong · 13 years ago
  28. b9de137 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" by James Dong · 13 years ago
  29. e239bd8 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) by felipeal · 13 years ago
  30. 35ef14c am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) by felipeal · 13 years ago
  31. 258bab7 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) by felipeal · 13 years ago
  32. 3c1468c am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) by felipeal · 13 years ago
  33. 849fd75 Merge "Import translations. DO NOT MERGE" by Eric Fischer · 13 years ago
  34. 3eca79c Merge "Import translations. DO NOT MERGE" by Eric Fischer · 13 years ago
  35. 5f52a39 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" by Jean-Baptiste Queru · 13 years ago
  36. 3d29dab am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" by Jean-Baptiste Queru · 13 years ago
  37. 84c7c01 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" by Jean-Baptiste Queru · 13 years ago
  38. 4298b29 Merge "Suppress StrictMode in handleBindApplication()." by Jeff Sharkey · 13 years ago
  39. c6f989c Merge "Remove unnecessary header file includes for drmserver" by James Dong · 13 years ago
  40. b9c8dcd Merge "Added missing javadoc comment for public API in DrmUtils class" by James Dong · 13 years ago
  41. d259166 am bb189574: am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  42. f4b8e8f am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  43. e2f8d49 am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  44. f46bc31 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  45. d53894e am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  46. 51e749a am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  47. e81927c Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  48. 74c9a3b Merge "Fix cursorRingBounds NPE" by John Reck · 13 years ago
  49. ed66e1b Merge "Fix NPE" by John Reck · 13 years ago
  50. eb040a1 Merge "You could think of this as what an OEM might do." by Dianne Hackborn · 13 years ago
  51. a9e4401 Merge "Deprecated a mis-spelled method and replaced it with a new method" by James Dong · 13 years ago
  52. c1bf223 am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp by Android Git Automerger · 13 years ago
  53. 7a415d2 am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. by Svetoslav Ganov · 13 years ago
  54. 20801d6 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp by Android Git Automerger · 13 years ago
  55. 2891b9a am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. by Svetoslav Ganov · 13 years ago
  56. c502f3b am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. by Svetoslav Ganov · 13 years ago
  57. c1a5853 am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. by Svetoslav Ganov · 13 years ago
  58. 6948e13 am a2b41b43: NumberPicker showing IME when its input field gains focus. by Svetoslav Ganov · 13 years ago
  59. 3191d48 am a2b41b43: NumberPicker showing IME when its input field gains focus. by Svetoslav Ganov · 13 years ago
  60. c28371d Merge "Fixes update of extras Bundle in new Locations for GPS Provider" by Jean-Baptiste Queru · 13 years ago
  61. e82b06b Merge "Unlock effect chains in the middle of two if's" by Glenn Kasten · 13 years ago
  62. a0401c3 Merge "Simplify removeNotificationClient" by Glenn Kasten · 13 years ago
  63. 9f22baf Merge "AudioFlinger const methods and parameters" by Glenn Kasten · 13 years ago
  64. 81ecdad am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  65. 6054e3e am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" by Jean-Baptiste Queru · 13 years ago
  66. aea5039 Merge "Fix theoretical race condition in addOutputTrack" by Glenn Kasten · 13 years ago
  67. 2f0b8f0 Merge "AudioBufferProvider comments and cleanup" by Glenn Kasten · 13 years ago
  68. ed61a47 Merge "a window could get stuck to gpu composition" by Mathias Agopian · 13 years ago
  69. e0dec77 Merge "move CursorWindow from libbinder to libandroidfw" by Mathias Agopian · 13 years ago
  70. 89d353a move CursorWindow from libbinder to libandroidfw by Mathias Agopian · 13 years ago
  71. 679154b Merge "Move NetworkStatsFactory to faster ProcFileReader." by Jeff Sharkey · 13 years ago
  72. 910b2b2 Merge "Add tracing to various graphics components." by Jamie Gennis · 13 years ago
  73. 1c8e95c Add tracing to various graphics components. by Jamie Gennis · 13 years ago
  74. c13af3c Merge "Suppress StrictMode when reading /proc/ files." by Jeff Sharkey · 13 years ago
  75. 793be05 Merge "View pressed state dispatching tweaks" by Adam Powell · 13 years ago
  76. fa8009d Merge "remove dependency on unneeded headers" by Mathias Agopian · 13 years ago
  77. 6946027 Merge "VpnDialogs: hide the fields when the statistic numbers are unavailable." by Chia-chi Yeh · 13 years ago
  78. 7244f94 Merge "Remove unnecessary code" by Michael Jurka · 13 years ago
  79. 8b82aff Merge "Removed dependecies between BufferQueue and SurfaceTexture" by Jamie Gennis · 13 years ago
  80. fd970dd Merge "dumpstate: use /system/xbin/su directly" by JP Abgrall · 13 years ago
  81. 962ccb6 am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  82. f4a4754 Merge "Increase max size of log size by 50% on userdebug builds." by Dave Burke · 13 years ago
  83. 476df7e am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  84. ec923ee a window could get stuck to gpu composition by Mathias Agopian · 13 years ago
  85. 5316ab3 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  86. eae59d2 Removed dependecies between BufferQueue and SurfaceTexture by Daniel Lam · 14 years ago
  87. 01d80ee Merge "Fixed minor typo on Javadoc" by felipeal · 13 years ago
  88. c060dde Merge "audio preprocessing: fix multiple enable problem" by Eric Laurent · 13 years ago
  89. 5e783b3 Merge "Add new Reminder Method: Alarm" by Alon Albert · 13 years ago
  90. 275a6eb Merge "Fix bug introduced when moving animation step out from between assignments to wasAnimating and nowAnimating. Now wasAnimating once again contains the animation state prior to the animation step." by Craig Mautner · 13 years ago
  91. 5d46260 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  92. da12204 am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" by Jean-Baptiste Queru · 13 years ago
  93. 2d0b5da am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" by Jean-Baptiste Queru · 13 years ago
  94. 6a22ed0 am 93df415c: Merge "Add stubs for better compatibility" by Jean-Baptiste Queru · 13 years ago
  95. 02a8087 Merge "Import translations. DO NOT MERGE" by Eric Fischer · 13 years ago
  96. 47e81bd Merge "Add stubs for better compatibility" by Jean-Baptiste Queru · 13 years ago
  97. b423565 Merge "Selection highlight made possible with no editor" by Gilles Debunne · 13 years ago
  98. e0b9493 Merge "Fix for NPE on long press to start a selection on text." by Gilles Debunne · 13 years ago
  99. c4dba0b Merge "Fix for NPE when dragging on TextView" by Gilles Debunne · 13 years ago
  100. ccfce61 Merge "Removing GL calls from librs" by Alex Sakhartchouk · 13 years ago