commit | c8a7c1a69dfaac61a4d892f74acc755424a41685 | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Thu Oct 13 01:48:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 01:48:07 2016 +0000 |
tree | de9ed7424fb04972996f6419c5b0aa33f6f5d5c6 | |
parent | 1eb29f6a110fbc0c081d1a0c7352261ea7c9d289 [diff] | |
parent | 682bb8b4fa7cd987db46627c4fd9d2e9fd57f2f7 [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 Change-Id: Iad8f148c9adf0304e711a26ba68ba5085b57e313