tree 28d06edbedeb26edb32f5c0a865894decece91b7
parent 09465c5ea7ef69fb84e88a140224ec1fcc8f4aad
parent e0827cb05ddc4ad659fcb4d504659bb97ec03444
author Pawin Vongmasa <pawin@google.com> 1476324907 +0000
committer android-build-merger <android-build-merger@google.com> 1476324907 +0000

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
am: e0827cb05d

Change-Id: I481b03435d7d52bc29f235ffc51a6eb105dfa54b