| commit | 1636cf6e67afb7839b673bfc9c47bdcdb5926bcd | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jun 06 20:15:57 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 06 20:15:58 2017 +0000 |
| tree | c3e551f8f7ab90e96f9ba0b16ccc09a158df319d | |
| parent | 3a9b8b1a05ee3f748b8675489cada254ae944f9a [diff] | |
| parent | 429b9270b1007cf845f351edc132349c391ec125 [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 -s ours am: c3c67fef5d" into oc-dev-plus-aosp