Commit 498ddf8f authored Sep 15, 2015 by Dan Austin Committed by Android Git Automerger Sep 15, 2015

am 0f97cc30: resolved conflicts for 27f09f91 to stage-aosp-master

* commit '0f97cc30':
  Enable signed-intger-overflow in colorconversion.

media/libstagefright/colorconversion/Android.mk

+1 −0

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

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

		LOCAL_MODULE:= libstagefright_color_conversion