OSDN Git Service

Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
authorPawin Vongmasa <pawin@google.com>
Thu, 13 Oct 2016 01:41:06 +0000 (01:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 01:41:06 +0000 (01:41 +0000)
am: 1099791bd6  -s ours

Change-Id: I36113550446744b6a96f9e080245d2e549dfb177


Trivial merge