commit 2b1fde68a737d5d8df538d3e523f2e96bb2198fc
author Colin Cross <ccross@android.com> Fri Jun 15 22:37:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 15 22:37:01 2018 -0700
tree 31ff46012cbdf9e5b5d47a077c344aca14f9e4b7
parent f60bb4ab32474b2523fee44e621222665f66126b
parent f9abc344d6ef1dba89282da20562f33ffed74e47

Fix ManifestMerger issues
am: f9abc344d6

Change-Id: Ife4901ae5493c5e45640376055c692d0014bd997

partner_support/Android.mk

diff --git a/partner_support/Android.mk b/partner_support/Android.mk
index 9a45e70..8306921 100644
--- a/partner_support/Android.mk
+++ b/partner_support/Android.mk
@@ -8,6 +8,7 @@
 LOCAL_MODULE_CLASS := STATIC_JAVA_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := system_current
+LOCAL_MIN_SDK_VERSION := 23
 
 LOCAL_USE_AAPT2 := true
 

tuner/Android.mk

diff --git a/tuner/Android.mk b/tuner/Android.mk
index ce17a3c..aedda3c 100644
--- a/tuner/Android.mk
+++ b/tuner/Android.mk
@@ -36,6 +36,8 @@
     android-support-tv-provider \
     tv-common \
 
+LOCAL_MIN_SDK_VERSION := 23
+
 include $(LOCAL_PATH)/buildconfig.mk
 
 include $(BUILD_STATIC_JAVA_LIBRARY)