Merge "Fix telephony-common build error"

include $(CLEAR_VARS)

LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java

LOCAL_SRC_FILES := \

	src/java/com/android/internal/telephony/ISms.aidl \

    src/java/com/android/internal/telephony/IIccPhoneBook.aidl \

    src/java/com/android/internal/telephony/EventLogTags.logtags \

LOCAL_SRC_FILES += $(call all-java-files-under, src/java)

LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \

	$(call all-Iaidl-files-under, src/java) \

	$(call all-logtags-files-under, src/java)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := telephony-common