OSDN Git Service

Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
authorWei Jia <wjia@google.com>
Tue, 6 Jun 2017 19:28:34 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 19:28:34 +0000 (19:28 +0000)
am: e138ca8b82

Change-Id: I5f55433da57c986167d638b4ea65edafb087b7b1


Trivial merge