OSDN Git Service

Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
authorPawin Vongmasa <pawin@google.com>
Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)
commit54c0001dc955398e855a36c082c4f3e517e92ad9
treeb80b67bf0aab6f88443e807f6a0581d3e47cd162
parent7b9756261dff30ff57f93c3e10959f9f3c8aa8b5
parentd18d8fac612e57044ff3fe2c35ac2112e6b7bc18
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42
am: d18d8fac61  -s ours

Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4