Merge "Fix ManifestMerger issues" am: 684b5f038b

am: c5e5b64b04

Change-Id: I4b8e51aaec1f825e4ccf7ccbc60e61b82e05c509
This commit is contained in:
Colin Cross
2018-06-15 22:46:10 -07:00
committed by android-build-merger

View File

@@ -26,6 +26,8 @@ LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MIN_SDK_VERSION := 21
include $(BUILD_STATIC_JAVA_LIBRARY)
# For the test package.