| commit | 0b572b4b39d6c26db4148a44b37c85645290cefe | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Jul 15 00:31:57 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jul 15 00:31:57 2017 +0000 |
| tree | 26ab3f58b806f48b570991207480f8def77b0276 | |
| parent | d343f95269973e102f2790b7b96cfa536323f8b9 [diff] | |
| parent | aabaf3f04d91b7a6b993704b2c7f89792388d1cc [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