- 1d2ad70 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." by James Dong · 14 years ago
- 8c3ddf9 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
- a1f988d merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 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
- 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
- e933cb5 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
- 0e0c322 Fix a subtitle bug: multiple blank lines in SubRip(srt) file. by Insun Kang · 14 years ago
- 7c56bb3 am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
- 88b00e9 am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
- e8e5f86 Fix log spamming during time lapse video recording by James Dong · 14 years ago
- c637289 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
- 7383d41 am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
- 26900df am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
- 6f5cc45 am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
- 91e2c7d status_t != bool by Marco Nelissen · 14 years ago
- 153cefd status_t != bool by Marco Nelissen · 14 years ago
- 71b61a9 Report a runtime error instead of asserting on malformed avc configuration data. by Andreas Huber · 14 years ago
- 0c5ce9b Merge "Bug 5522189 re-enable ARM opts but disable inline" by Glenn Kasten · 14 years ago
- c23e2f2 Bug 5522189 re-enable ARM opts but disable inline by Glenn Kasten · 14 years ago
- 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
- 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
- 6479b95 Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
- 1de4e2e Merge "MidiFile uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
- 528312c Merge "JetPlayer uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
- aaa12ed merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- c57c82e am 4dce941e: am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
- 90100b5 MidiFile uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
- a23856c JetPlayer uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
- 8791351 Bug 4903178 Restore priority and cgroup on stop by Glenn Kasten · 14 years ago
- c34233e Make sure not to cancel pending seek/EOS notifications on a cache underrun... by Andreas Huber · 14 years ago
- 185b1e3 am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
- 7b81bc3 No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
- fd8f534 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 14 years ago
- 6c3bc93 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 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
- 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
- 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
- 5ee2648 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 3a9cefe Fix for issue 5309336 by Hong Teng · 14 years ago
- c4795ec am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
- 41ff785 am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
- 72ae9fd Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
- b0ea0f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 544fe9b audioflinger: fix noise when skipping to next song by Eric Laurent · 14 years ago
- 78ff828 am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
- 73bb0b9 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
- 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
- 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
- a36d8ca am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
- 18f9bb1 am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
- 1e809ed am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
- 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
- 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
- 87f6855 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
- 7ac9a9a Merge "Didn't mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
- 91f2304 Didn't mean to check this in... by Andreas Huber · 14 years ago
- 04ccb82 Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
- 73b1fd5 Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1 by Andreas Huber · 14 years ago
- 4ab3045 Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 by Andreas Huber · 14 years ago
- 4c5f7e3 Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago
- 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
- cb432e6 am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 by James Dong · 14 years ago
- 0bb8020 Merge "Adds handler type 'sbtl' to support subtitles in various containers." by James Dong · 14 years ago
- 29c6bf8 Merge "Fix log message" by Glenn Kasten · 14 years ago
- 0fbe057 Disconnect on socket error on the RTSP control connection. by Andreas Huber · 14 years ago
- 40ddcb7 Fix log message by Glenn Kasten · 14 years ago
- 4977479 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
- 19de627 DO NOT MERGE: Instead of asserting, remove active streams if their sockets by Andreas Huber · 14 years ago
- f0c86a8 Instead of asserting, signal a runtime error if the session doesn't contain by Andreas Huber · 14 years ago
- 4948818 Add support for retrieving location information in mp4/3gpp files by James Dong · 14 years ago
- 7cad0b4 am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 by Andreas Huber · 14 years ago
- a585407 am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 by Andreas Huber · 14 years ago
- 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
- 3df40a0 visualizer: reset buffer if playback is idle by Eric Laurent · 14 years ago
- eda3ab0 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 by Andreas Huber · 14 years ago
- eec2d81 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 by Andreas Huber · 14 years ago
- 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
- 1dc0ab1 Merge "Send RTSP control connection keep-alive requests" into ics-mr1 by Andreas Huber · 14 years ago
- ca957d7 Merge "Don't believe the PV decoder's lies..." into ics-mr1 by Andreas Huber · 14 years ago
- 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
- e26dd87 Adds handler type 'sbtl' to support subtitles in various containers. by Insun Kang · 14 years ago
- 32beb27 am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 14 years ago
- 6977ca7 am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 by Eric Laurent · 14 years ago
- d9f9f24 Merge "Instead of asserting, remove active streams if their sockets return failure" by Andreas Huber · 14 years ago
- 8c308ff Instead of asserting, remove active streams if their sockets return failure by Andreas Huber · 14 years ago
- fa1e6f9 am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 14 years ago
- 2961a85 There's no point in trying to continue to decode after an error was signalled. by Andreas Huber · 14 years ago
- d7292d5 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 0029faf Don't believe the PV decoder's lies... by Andreas Huber · 14 years ago
- 0ac360e am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 14 years ago
- b5d3403 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 14 years ago
- 12edddb am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 by Eric Laurent · 14 years ago
- 756961c merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 32f0a8c am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 14 years ago
- a47b69c Fix regression for SoundPool playback by Eric Laurent · 14 years ago
- 908dbde Send RTSP control connection keep-alive requests by Andreas Huber · 14 years ago
- 471af5a resolved conflicts for merge of 26f70db9 to master by Andreas Huber · 14 years ago
- 936a981 Merge "Remove surface legacy APIs and code." into ics-mr1 by Andreas Huber · 14 years ago
- 3b86c96 am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 by Eric Laurent · 14 years ago
- e1a8a71 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 by Eric Laurent · 14 years ago