resolved conflicts for merge of c86eae32 to klp-modular-dev

Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f

media/libstagefright/MPEG4Extractor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -2062,7 +2062,7 @@ status_t MPEG4Extractor::parseTrackHeader(
		}

		status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) {
		if (size < 4) {
		if (size < 4 \|\| size == SIZE_MAX) {
		return ERROR_MALFORMED;
		}