| commit | 02d1d044981b6a28d18a72d7a897f50f446c3a80 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 19:15:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 19:15:45 2016 +0000 |
| tree | f7273bbe636ccc44b8c0c6f2ad31c6f8a77244dd | |
| parent | 413afa2586b2627a08a7d0c4954eef639727d0fa [diff] | |
| parent | 28561389e9c344cbc699b58ad5b490505e9342b1 [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 am: 28561389e9 * commit '28561389e9c344cbc699b58ad5b490505e9342b1': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I0efe507b0689e3491dd8590b3f0b04629bc39f57