Merge "Skip track if verification fails" into mnc-dev

author Dongwon Kang <dwkang@google.com>

Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)

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

Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)
author Dongwon Kang <dwkang@google.com>
Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
author	Dongwon Kang <dwkang@google.com>
	Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)