resolved conflicts for merge of 6dd63b23 to mnc-dev-plus-aosp

Change-Id: I52c5738351ed5cad2fbc64272af4eb47b3417dff

media/libstagefright/omx/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ LOCAL_SHARED_LIBRARIES := \
		LOCAL_MODULE:= libstagefright_omx
		LOCAL_CFLAGS += -Werror -Wall
		LOCAL_CLANG := true
		LOCAL_SANITIZE := unsigned-integer-overflow

		include $(BUILD_SHARED_LIBRARY)