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