Merge "Fix ManifestMerger issues"

am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
This commit is contained in:
Colin Cross
2018-06-15 16:59:21 -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.