tree 2dfb91352f0eb22d987305f684c55cb03e0d6411
parent f5032a44266308ea401deecd3982f3a7bcb44410
parent 63a2a35eec8c7ee2516f43b017f9385fb1e565eb
author Pawin Vongmasa <pawin@google.com> 1476324906 +0000
committer android-build-merger <android-build-merger@google.com> 1476324906 +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: 63a2a35eec

Change-Id: If0365997d3792893db22b422a2798f7b1bfed45f