OSDN Git Service

DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86...
authorPawin Vongmasa <pawin@google.com>
Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)
am: f1e84ca858  -s ours

Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3


Trivial merge