| commit | 0f05641305f557a1a91c336b8999f2569395aa0b | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Sat Jul 15 00:48:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 15 00:48:34 2017 +0000 |
| tree | 5d2d819ab5b064e266d1b5bc0dcd2c41c4b27401 | |
| parent | 21a119eb19617d024d7c370ae0e322f8b85c80e4 [diff] | |
| parent | 4a9524812b602399ceac9e2ce24ffe1e3ad58f88 [diff] |
Merge "Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d am: 4fa1ff8958 -s ours am: 024216f32b am: aee0c0b508" into oc-dr1-dev-plus-aosp am: 4a9524812b Change-Id: I4f9805c5737f7226c9351d924b8b47c4253a77a4