resolved conflicts for 60d65657 to stage-aosp-master

Change-Id: I22eae9ec9332182b575df0965dcb034530b76bd4

media/libstagefright/yuv/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,5 +14,6 @@ LOCAL_MODULE:= libstagefright_yuv

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

		include $(BUILD_SHARED_LIBRARY)