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:22:25 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 19:22:25 +0000 (19:22 +0000)
am: 16531bf687

Change-Id: I3e1f949e4781eba1fa5599c1a4ee2a07dcd47e43


Trivial merge