summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2015-06-09 16:16:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-09 16:16:50 +0000
commitc258a84f096635e9c471e0597ab5ab258e1609ba (patch)
treeabc56099af64fefa7d88385e0db942bc6a927d0b /packages/SettingsLib
parentfb89df9fc220245a0ac5e3923acae2b6308d9edc (diff)
parenteeb3443cc61de6772d1c5f86e6098a41d5f40268 (diff)
downloadframeworks_base-c258a84f096635e9c471e0597ab5ab258e1609ba.zip
frameworks_base-c258a84f096635e9c471e0597ab5ab258e1609ba.tar.gz
frameworks_base-c258a84f096635e9c471e0597ab5ab258e1609ba.tar.bz2
am eeb3443c: Merge "Add uses-sdk to reduce red squigglies" into mnc-dev
* commit 'eeb3443cc61de6772d1c5f86e6098a41d5f40268': Add uses-sdk to reduce red squigglies
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r--packages/SettingsLib/AndroidManifest.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SettingsLib/AndroidManifest.xml b/packages/SettingsLib/AndroidManifest.xml
index eacafd5..3873593 100644
--- a/packages/SettingsLib/AndroidManifest.xml
+++ b/packages/SettingsLib/AndroidManifest.xml
@@ -16,5 +16,9 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.settingslib">
+ package="com.android.settingslib">
+
+ <uses-sdk
+ android:minSdkVersion="21" />
+
</manifest>