tree 5f71b4d61fab26dbcb28299a99e27486a58212f1
parent d7ec581644f5f514636f6f762d2fc6d00ec16af0
parent ad1141b06b6f9bd45ccc48e3458f906899a69878
author Pawin Vongmasa <pawin@google.com> 1476321588 +0000
committer android-build-merger <android-build-merger@google.com> 1476321588 +0000

DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 0338b14e28  -s ours am: 648b682eeb am: d558903f8c  -s ours
am: ad1141b06b

Change-Id: Id96e179a59d415070f5975742e50e9746e011e54