| commit | 940308ec4f200f253952aac3e1f500be0baf95a1 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Jun 06 20:22:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 20:22:09 2017 +0000 |
| tree | 04fa8f90768434da82f43ca2b490658a8f9bce78 | |
| parent | 58508129d3de4b3bff59b2507a87dae60ac927ee [diff] | |
| parent | 3a9b8b1a05ee3f748b8675489cada254ae944f9a [diff] |
Merge "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 am: 2ab8c23b51 am: 975e2275ce am: 529fc839a2 am: b17bb4e251 am: 43d484ebe4 am: f70687a00d -s ours" into oc-dev-plus-aosp am: 3a9b8b1a05 Change-Id: I7c8ea311c40a0f7f282949d513ae6d7ebf1aec3d