resolved conflicts for fd86dd2d to stage-aosp-master

Change-Id: I0428b0655d49295ed09e21d62d41851f76a76c26

media/libstagefright/http/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ LOCAL_CFLAGS += -Wno-multichar

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

		include $(BUILD_SHARED_LIBRARY)