resolved conflicts for 619e79a2 to stage-aosp-master

Change-Id: I74c0f17059db87fbd8b83e7f82e42b6ff76e7b9d

media/libstagefright/wifi-display/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES:= \

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

		LOCAL_MODULE:= libstagefright_wfd