tree cc7f61137e232353dba76bcf172210d6a4fb96c9
parent a64aff4551184706e379c14346c263df06b640e9
parent 2a930213ed3debc9ea633048950d3bb580186a53
author Wei Jia <wjia@google.com> 1496778007 +0000
committer android-build-merger <android-build-merger@google.com> 1496778007 +0000

Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours am: 98a5397265 am: bb3d5445c9  -s ours am: 16531bf687 am: e138ca8b82 am: cfd9b9b85a
am: 2a930213ed  -s ours

Change-Id: I9767275a479be9be3045ac6cc5a233b58ecd77a0