tree 5f71b4d61fab26dbcb28299a99e27486a58212f1
parent 6b049098e72e53fbcd11dad58a363fa35a22db5e
parent c2af35e25dfbe6c1bfd55c9ddc8a549dc592381e
author Pawin Vongmasa <pawin@google.com> 1476321166 +0000
committer android-build-merger <android-build-merger@google.com> 1476321166 +0000

DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde am: 428493c16d  -s ours
am: c2af35e25d

Change-Id: I3ecb5174b9cdcfea100980f10390655c33681e31