| commit | 28561389e9c344cbc699b58ad5b490505e9342b1 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 19:11:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 19:11:35 2016 +0000 |
| tree | 0e2bf22f7c27ff3fc6bd938cb6c52163d9a8eac5 | |
| parent | daaece7f7c9ba4a5b8c743fc72e603ae04e38e4f [diff] | |
| parent | c65002b096c4015e798a0ea685df0119c137b596 [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 am: e83713c198 -s ours am: 63a4f82181 am: c65002b096 * commit 'c65002b096c4015e798a0ea685df0119c137b596': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I228aaba5a714cdfa180bb368cc192c5c6260d33e