| commit | e67ec85275761fc2b8d55e3fb378528052b8fff7 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 18:53:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 18:53:57 2016 +0000 |
| tree | 8ba862ff53608e0b36b7ae8d54125ca077dc000e | |
| parent | 1094b530ad2189ab879ef0bc20bae820b3d12c86 [diff] | |
| parent | 4223af4708e4524375385efe13f7ddebfd71ffcf [diff] |
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 * commit '4223af4708e4524375385efe13f7ddebfd71ffcf': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I436f52467a51665718a613ef00ff8ad4899acd72