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