| commit | 6b52fd6b673c44afc6fe57e85ef8b6994ea84659 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 21:20:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 21:20:17 2016 +0000 |
| tree | 8249df6d200d28dfa42e485214c8e3907d78160b | |
| parent | e67ec85275761fc2b8d55e3fb378528052b8fff7 [diff] | |
| parent | 67ca3caf10929022b2b742b49a88ff1238d3bbe7 [diff] |
resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 * commit '67ca3caf10929022b2b742b49a88ff1238d3bbe7': MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: Ib76faa0fc2fd5a854f40b5c31fe7c8bfe0d6e3d6