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