Commit 45fc581c authored Sep 23, 2015 by Chad Brubaker Committed by Android Git Automerger Sep 23, 2015

am 9664e182: resolved conflicts for a17b1999 to stage-aosp-master

* commit '9664e182':
  Revert "Enable integer overflow detection in libmedia"

media/libmedia/Android.mk

+0 −1

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

		LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall
		LOCAL_CLANG := true
		LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow

		include $(BUILD_SHARED_LIBRARY)