commit | 63a2a35eec8c7ee2516f43b017f9385fb1e565eb | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Thu Oct 13 02:08:08 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 02:08:08 2016 +0000 |
tree | 6f03f44be7a25e72b2c74c073c3406f3713fb640 | |
parent | 7298c1c03744a39b87c9d8ab7142bae1400ecbb7 [diff] | |
parent | bf3c1268ea9cfecf57482d33dea9b3f5cf3f7a16 [diff] |
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42 am: d18d8fac61 -s ours am: 54c0001dc9 -s ours am: 253e3ae0ba am: 42e8d24ca9 -s ours am: 0bed5b7803 am: 682bb8b4fa am: c8a7c1a69d am: 6a21e6ca3f -s ours am: bf3c1268ea Change-Id: I7eb812ec33dfbc811b6a40b3dc3900b8182120e0