OSDN Git Service

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
authorWei Jia <wjia@google.com>
Sat, 15 Jul 2017 00:14:35 +0000 (00:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Jul 2017 00:14:35 +0000 (00:14 +0000)
am: 29b801537c  -s ours

Change-Id: I0b3318fac39fae495963b005d22a3d954798b5f9


Trivial merge