| commit | 45ba68bcb3469a58c5fa7f80b8a9e32e2ab328a5 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Sat Jul 15 00:36:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 15 00:36:01 2017 +0000 |
| tree | 2c5d00f2d32682988f2407223e55b19d7b4f409f | |
| parent | 780feb8aee49c0e3c7e1112893811f3f0a676afe [diff] | |
| parent | 0b572b4b39d6c26db4148a44b37c85645290cefe [diff] |
Merge "Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2 am: 76301f781d -s ours am: d3e64e7e1e am: bfff1b4942" into oc-dr1-dev-plus-aosp am: 0b572b4b39 Change-Id: I493557e6d35cc599aca72c5da496b40b5d6677cd