Back Merge from rel branch to dev branch after N-MR1 upgrade

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

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

LOCAL_MODULE := settings-logtags

include $(BUILD_STATIC_JAVA_LIBRARY)

# Build the Settings APK

include $(CLEAR_VARS)

LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    jsr305

    jsr305 \

    settings-logtags

LOCAL_MODULE_TAGS := optional