Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev

author Wei Jia <wjia@google.com>

Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)
author Wei Jia <wjia@google.com>
Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
author	Wei Jia <wjia@google.com>
	Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)