1. f963220 Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" by Mike Lockwood · 14 years ago
  2. 48bd916 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  3. 42fb390 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  4. 44c1908 MTP: Don't attempt to read more than 16K at a time from the MTP driver by Mike Lockwood · 14 years ago
  5. 17078d8 am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 by Andreas Huber · 14 years ago
  6. 1d26d11 am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 by Andreas Huber · 14 years ago
  7. 4fe1c6c Fixes a typo in AVIExtractor that would advertise the wrong video dimensions by Andreas Huber · 14 years ago
  8. 2c0dd96 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  9. cd9e929 am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 14 years ago
  10. ea9d51b resolved conflicts for merge of 3d630e86 to master by Andreas Huber · 14 years ago
  11. 2907dac merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  12. 37a153f Merge "Add camera focus move callback." by Wu-cheng Li · 14 years ago
  13. 7a3a2b2 Fix the broken build by James Dong · 14 years ago
  14. 1503185 am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 14 years ago
  15. 21befea Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 14 years ago
  16. 8afbf8e am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 14 years ago
  17. c089d02 am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  18. eca36b5 resolved conflicts for merge of 998a929a to master by Andreas Huber · 14 years ago
  19. 8a1fac3 am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1 by Andreas Huber · 14 years ago
  20. b96d3c5 am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 14 years ago
  21. 6bf045c am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  22. b19386f am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1 by Andreas Huber · 14 years ago
  23. 7609b23 Merge "Make sure we can properly shutdown even if" into ics-mr1 by Andreas Huber · 14 years ago
  24. 5274010 Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 14 years ago
  25. 544ee28 Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  26. bfcc8d8 Updated (internal) API for IStreamSource to signal discontinuities by Andreas Huber · 14 years ago
  27. d620506 Add camera focus move callback. by Wu-cheng Li · 14 years ago
  28. 6e3d311 Finer granularity discontinuity support. by Andreas Huber · 14 years ago
  29. b58ce9f Make sure we can properly shutdown even if by Andreas Huber · 14 years ago
  30. 404a123 split ComposerService out of SurfaceComposerClient.h by Mathias Agopian · 14 years ago
  31. c9260c1 Merge "Make AudioTrack a RefBase so wrappers not needed" by Glenn Kasten · 14 years ago
  32. d748311 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  33. d3d8222 If an error occurs that prevents us from reallocating buffers during a format change by Andreas Huber · 14 years ago
  34. 926798f am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 by Eric Laurent · 14 years ago
  35. 3aadf3a am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 by Eric Laurent · 14 years ago
  36. 7cafbb3 audioflinger: reduce sleep time to avoid underrun by Eric Laurent · 14 years ago
  37. 1d2ad70 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." by James Dong · 14 years ago
  38. 8c3ddf9 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
  39. a1f988d merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  40. a7e4865 am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  41. a0c986c am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  42. e933cb5 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  43. 0e0c322 Fix a subtitle bug: multiple blank lines in SubRip(srt) file. by Insun Kang · 14 years ago
  44. 7c56bb3 am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
  45. 88b00e9 am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
  46. 4c57986 SurfaceMediaSource: use the vid enc usage bit by Jamie Gennis · 14 years ago
  47. e8e5f86 Fix log spamming during time lapse video recording by James Dong · 14 years ago
  48. c637289 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
  49. 7383d41 am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  50. 26900df am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  51. 6f5cc45 am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  52. 91e2c7d status_t != bool by Marco Nelissen · 14 years ago
  53. 153cefd status_t != bool by Marco Nelissen · 14 years ago
  54. 71b61a9 Report a runtime error instead of asserting on malformed avc configuration data. by Andreas Huber · 14 years ago
  55. 0c5ce9b Merge "Bug 5522189 re-enable ARM opts but disable inline" by Glenn Kasten · 14 years ago
  56. c23e2f2 Bug 5522189 re-enable ARM opts but disable inline by Glenn Kasten · 14 years ago
  57. 60047ae am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  58. 7f2bec1 am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  59. 6479b95 Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  60. 1de4e2e Merge "MidiFile uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
  61. 528312c Merge "JetPlayer uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
  62. aaa12ed merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  63. c57c82e am 4dce941e: am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  64. 90100b5 MidiFile uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
  65. a23856c JetPlayer uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
  66. 8791351 Bug 4903178 Restore priority and cgroup on stop by Glenn Kasten · 14 years ago
  67. c34233e Make sure not to cancel pending seek/EOS notifications on a cache underrun... by Andreas Huber · 14 years ago
  68. 185b1e3 am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  69. 7b81bc3 No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  70. fd8f534 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 14 years ago
  71. 6c3bc93 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  72. b68a91a Make AudioTrack a RefBase so wrappers not needed by Glenn Kasten · 14 years ago
  73. 5c05221 am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 by Hong Teng · 14 years ago
  74. e7cf4ee am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 by Hong Teng · 14 years ago
  75. 9621add Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 by Hong Teng · 14 years ago
  76. 5ee2648 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  77. 3a9cefe Fix for issue 5309336 by Hong Teng · 14 years ago
  78. c4795ec am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  79. 41ff785 am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  80. 72ae9fd Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  81. b0ea0f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  82. 544fe9b audioflinger: fix noise when skipping to next song by Eric Laurent · 14 years ago
  83. 78ff828 am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  84. 73bb0b9 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  85. 516fb1d am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 by Andreas Huber · 14 years ago
  86. 54500e5 am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 by Andreas Huber · 14 years ago
  87. a36d8ca am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
  88. 18f9bb1 am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  89. 1e809ed am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  90. 2e56cfc am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 by Andreas Huber · 14 years ago
  91. 8ae0f55 am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 by Andreas Huber · 14 years ago
  92. 87f6855 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
  93. 7ac9a9a Merge "Didn't mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  94. 91f2304 Didn't mean to check this in... by Andreas Huber · 14 years ago
  95. 04ccb82 Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  96. 73b1fd5 Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1 by Andreas Huber · 14 years ago
  97. 4ab3045 Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 by Andreas Huber · 14 years ago
  98. 4c5f7e3 Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
  99. 023132e am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 by James Dong · 14 years ago
  100. cb432e6 am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 by James Dong · 14 years ago