tree 4c8f0becc19d4030a42a53f91b09e8dd2dd4cb01
parent 47783eb09ea0478af3a5635d6ba5c49ab2c56d69
parent a82f20c9937318af99d1d33f109a47c116966077
author Pawin Vongmasa <pawin@google.com> 1476323705 +0000
committer android-build-merger <android-build-merger@google.com> 1476323705 +0000

Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev am: 622fd04e88 am: 862b281476  -s ours am: 5e94f64995 am: d7ec581644 am: 60d1b58bf1 am: bb08cac420  -s ours am: 0b8c6e6a92 am: 25ca25a009
am: a82f20c993

Change-Id: I8d73505f7269511d627e90c96c285dca8a76ff64