commit | 1ed4ec584b736febb95e5fe390bfc1ffea039b99 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Wed May 25 18:45:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 25 18:45:07 2016 +0000 |
tree | 5cbca8835b3e060748db10f0c44bdfb72edb5fc3 | |
parent | cbe776167a52a43f6acbafd3278e662840a256c2 [diff] | |
parent | 3d1df4f411a531fb30cc8563cb39e732041d22ad [diff] |
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours * commit '3d1df4f411a531fb30cc8563cb39e732041d22ad': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: Id6ce35c59190c3d94129e8ec4c1f2aef108fa71a