Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...

author Marco Nelissen <marcone@google.com>

Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)

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

Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)
author Marco Nelissen <marcone@google.com>
Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)
diff --cc media/libstagefright/AMRExtractor.cpp
Simple merge
diff --cc media/libstagefright/NuMediaExtractor.cpp
Simple merge
author	Marco Nelissen <marcone@google.com>
	Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)
		1	2
media/libstagefright/AMRExtractor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/NuMediaExtractor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history