Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb

author Marco Nelissen <marcone@google.com>

Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)

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

Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)
author Marco Nelissen <marcone@google.com>
Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp

index 00215c9,0996cdf..885f2cb

mode 100644,100755..100644
--- 1/media/libstagefright/MPEG4Extractor.cpp
--- 2/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
author	Marco Nelissen <marcone@google.com>
	Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)