Merge "Fix ManifestMerger issues"
am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk
index 5a8be31..7b89fb2 100644
--- a/packages/SettingsLib/Android.mk
+++ b/packages/SettingsLib/Android.mk
@@ -26,6 +26,8 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
+LOCAL_MIN_SDK_VERSION := 21
+
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 # For the test package.