1. 37a153f Merge "Add camera focus move callback." by Wu-cheng Li · 14 years ago
  2. 7a3a2b2 Fix the broken build by James Dong · 14 years ago
  3. 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
  4. c089d02 am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  5. eca36b5 resolved conflicts for merge of 998a929a to master by Andreas Huber · 14 years ago
  6. 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
  7. 6bf045c am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  8. b19386f am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1 by Andreas Huber · 14 years ago
  9. 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
  10. 544ee28 Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  11. bfcc8d8 Updated (internal) API for IStreamSource to signal discontinuities by Andreas Huber · 14 years ago
  12. d620506 Add camera focus move callback. by Wu-cheng Li · 14 years ago
  13. 6e3d311 Finer granularity discontinuity support. by Andreas Huber · 14 years ago
  14. 404a123 split ComposerService out of SurfaceComposerClient.h by Mathias Agopian · 14 years ago
  15. c9260c1 Merge "Make AudioTrack a RefBase so wrappers not needed" by Glenn Kasten · 14 years ago
  16. d3d8222 If an error occurs that prevents us from reallocating buffers during a format change by Andreas Huber · 14 years ago
  17. 926798f am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 by Eric Laurent · 14 years ago
  18. 3aadf3a am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 by Eric Laurent · 14 years ago
  19. 7cafbb3 audioflinger: reduce sleep time to avoid underrun by Eric Laurent · 14 years ago
  20. 1d2ad70 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." by James Dong · 14 years ago
  21. 8c3ddf9 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
  22. a1f988d merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  23. 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
  24. 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
  25. e933cb5 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  26. 0e0c322 Fix a subtitle bug: multiple blank lines in SubRip(srt) file. by Insun Kang · 14 years ago
  27. 7c56bb3 am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
  28. 88b00e9 am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
  29. e8e5f86 Fix log spamming during time lapse video recording by James Dong · 14 years ago
  30. c637289 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
  31. 7383d41 am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  32. 26900df am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  33. 6f5cc45 am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  34. 91e2c7d status_t != bool by Marco Nelissen · 14 years ago
  35. 153cefd status_t != bool by Marco Nelissen · 14 years ago
  36. 71b61a9 Report a runtime error instead of asserting on malformed avc configuration data. by Andreas Huber · 14 years ago
  37. 0c5ce9b Merge "Bug 5522189 re-enable ARM opts but disable inline" by Glenn Kasten · 14 years ago
  38. c23e2f2 Bug 5522189 re-enable ARM opts but disable inline by Glenn Kasten · 14 years ago
  39. 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
  40. 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
  41. 6479b95 Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  42. 1de4e2e Merge "MidiFile uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
  43. 528312c Merge "JetPlayer uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
  44. aaa12ed merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  45. c57c82e am 4dce941e: am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  46. 90100b5 MidiFile uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
  47. a23856c JetPlayer uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
  48. 8791351 Bug 4903178 Restore priority and cgroup on stop by Glenn Kasten · 14 years ago
  49. c34233e Make sure not to cancel pending seek/EOS notifications on a cache underrun... by Andreas Huber · 14 years ago
  50. 185b1e3 am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  51. 7b81bc3 No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  52. fd8f534 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 14 years ago
  53. 6c3bc93 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  54. b68a91a Make AudioTrack a RefBase so wrappers not needed by Glenn Kasten · 14 years ago
  55. 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
  56. 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
  57. 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
  58. 5ee2648 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  59. 3a9cefe Fix for issue 5309336 by Hong Teng · 14 years ago
  60. c4795ec am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  61. 41ff785 am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  62. 72ae9fd Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  63. b0ea0f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  64. 544fe9b audioflinger: fix noise when skipping to next song by Eric Laurent · 14 years ago
  65. 78ff828 am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  66. 73bb0b9 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  67. 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
  68. 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
  69. a36d8ca am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
  70. 18f9bb1 am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  71. 1e809ed am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  72. 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
  73. 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
  74. 87f6855 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
  75. 7ac9a9a Merge "Didn't mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  76. 91f2304 Didn't mean to check this in... by Andreas Huber · 14 years ago
  77. 04ccb82 Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  78. 73b1fd5 Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1 by Andreas Huber · 14 years ago
  79. 4ab3045 Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 by Andreas Huber · 14 years ago
  80. 4c5f7e3 Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
  81. 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
  82. cb432e6 am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 by James Dong · 14 years ago
  83. 0bb8020 Merge "Adds handler type 'sbtl' to support subtitles in various containers." by James Dong · 14 years ago
  84. 29c6bf8 Merge "Fix log message" by Glenn Kasten · 14 years ago
  85. 0fbe057 Disconnect on socket error on the RTSP control connection. by Andreas Huber · 14 years ago
  86. 40ddcb7 Fix log message by Glenn Kasten · 14 years ago
  87. 4977479 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  88. 19de627 DO NOT MERGE: Instead of asserting, remove active streams if their sockets by Andreas Huber · 14 years ago
  89. f0c86a8 Instead of asserting, signal a runtime error if the session doesn't contain by Andreas Huber · 14 years ago
  90. 4948818 Add support for retrieving location information in mp4/3gpp files by James Dong · 14 years ago
  91. 7cad0b4 am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 by Andreas Huber · 14 years ago
  92. a585407 am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 by Andreas Huber · 14 years ago
  93. e9a919b am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 by Andreas Huber · 14 years ago
  94. 3df40a0 visualizer: reset buffer if playback is idle by Eric Laurent · 14 years ago
  95. eda3ab0 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 by Andreas Huber · 14 years ago
  96. eec2d81 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 by Andreas Huber · 14 years ago
  97. bb3e9eb am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 by Andreas Huber · 14 years ago
  98. 1dc0ab1 Merge "Send RTSP control connection keep-alive requests" into ics-mr1 by Andreas Huber · 14 years ago
  99. ca957d7 Merge "Don't believe the PV decoder's lies..." into ics-mr1 by Andreas Huber · 14 years ago
  100. d57a4dd Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1 by Andreas Huber · 14 years ago