resolved conflicts for b6c719ec to stage-aosp-master (031af4d5) · Commits · e / os / android_frameworks_av

media/libstagefright/timedtext/Android.mk

+1 −0

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

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

		LOCAL_C_INCLUDES:= \
		$(TOP)/frameworks/av/include/media/stagefright/timedtext \