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

Change-Id: I085da358f0ec517c0e6530eb22b5206981d1a8db

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