OSDN Git Service

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

Change-Id: I4d0b520a58b87d750d65450e270a314ff9aa7897


Trivial merge