| commit | e83713c1987c929af2ed704e1a395a334606fad0 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 18:58:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 18:58:19 2016 +0000 |
| tree | 875b309f0432572f402660e0e7df922047ee1d10 | |
| parent | 544030170121bd1220163ebf1c5de397a1f1bbcd [diff] | |
| parent | e67ec85275761fc2b8d55e3fb378528052b8fff7 [diff] |
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 * commit 'e67ec85275761fc2b8d55e3fb378528052b8fff7': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I96fd8075e4d3d379d30f7d269a47b15a1d3b4009