resolved conflicts for merge of 520d9ab3 to stage-aosp-master

Change-Id: I4dc12386a7ca9b814c674f0d9a44acfb817e8762

media/libstagefright/webm/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ LOCAL_CPPFLAGS += -D__STDINT_LIMITS

		LOCAL_CFLAGS += -Werror -Wall
		LOCAL_CLANG := true
		LOCAL_SANITIZE := unsigned-integer-overflow

		LOCAL_SRC_FILES:= EbmlUtil.cpp \
		WebmElement.cpp \