| commit | 266eacc66e8977c6baf0935bf35b8e74cf89b510 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 21:47:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 21:47:45 2016 +0000 |
| tree | 5f980fa3ef0f865e439e3acd8841e3404c85d2b5 | |
| parent | 02d1d044981b6a28d18a72d7a897f50f446c3a80 [diff] | |
| parent | ff8818df6f6bd07f80b9426af23a5f377e5843d6 [diff] |
resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c am: 5f44938fe9 am: ff8818df6f * commit 'ff8818df6f6bd07f80b9426af23a5f377e5843d6': MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: Ib96a7f164ba4846f33737f3388ea0c242af38636