resolved conflicts for c1d15931 to stage-aosp-master

Change-Id: Ifa38320051015548d04be30b4278adb34a4654a6

media/libstagefright/httplive/Android.mk

+1 −0

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

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

		LOCAL_SHARED_LIBRARIES := \
		libbinder \