tree 7c8ec851cc9c01b16b7a4d2e1fccba637a55354e
parent 93569567427fe8484d1bf57f547cc18daf6ef65b
parent dc1ee8698785617e5bf5c4f44625cbd1fc7d3601
author Pawin Vongmasa <pawin@google.com> 1476324471 +0000
committer android-build-merger <android-build-merger@google.com> 1476324471 +0000

DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86 am: 2c76c56d56 am: f1e84ca858  -s ours am: 7b9756261d  -s ours am: d676f1bfeb am: 0ce582e5c4  -s ours am: e843c53efa am: 22d0f74490 am: 1eb29f6a11 am: c8ce691ddb  -s ours
am: dc1ee86987

Change-Id: I744fa7185828a0c33a966adeb8966f9eb89e0344