| commit | 87406db29c09e16df8f0d82dd0547d3fb953ab92 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 21:32:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 21:32:51 2016 +0000 |
| tree | 719fa99948609975d92184f4b54525d3890c98d2 | |
| parent | 63a4f82181744b6a6ca82226489a9138ef7823fb [diff] | |
| parent | f4285f22bfe47791a1d21eaa28a4afce23f47c8d [diff] |
resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf * commit 'f4285f22bfe47791a1d21eaa28a4afce23f47c8d': MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I71b691a769641d3e3137b4fd954d784d073b9074