resolved conflicts for merge of b571ecfd to mnc-dr-dev-plus-aosp

Change-Id: Idae924d1298d02a4a51dbfaf37dac12e676f566d

media/libstagefright/id3/Android.mk

+1 −0

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

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

		LOCAL_MODULE := libstagefright_id3