OSDN Git Service

DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86...
authorPawin Vongmasa <pawin@google.com>
Thu, 13 Oct 2016 01:54:51 +0000 (01:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 01:54:51 +0000 (01:54 +0000)
am: 1eb29f6a11

Change-Id: Iabefaa42f7ddbb7393a441c29ebf9adbbee5bcbd


Trivial merge