resolved conflicts for f49f5d1f to stage-aosp-master

Change-Id: I35836b08d8ead64af04729f7e39cc5b79b97d38c

media/libstagefright/matroska/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ LOCAL_C_INCLUDES:= \

		LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
		LOCAL_CLANG := true
		LOCAL_SANITIZE := signed-integer-overflow

		LOCAL_MODULE:= libstagefright_matroska