Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id924273fc17b694a56d241fb8ce8d76e4cea1017
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e5904fa..d82c778 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,6 +28,8 @@
<uses-permission android:name="android.permission.BIND_WALLPAPER" />
<uses-permission android:name="android.permission.SET_WALLPAPER" />
+ <uses-sdk android:minSdkVersion="14"/>
+
<application
android:label="@string/application_name"
android:icon="@mipmap/ic_launcher_live_wallpaper"
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index e027262..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2008 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4119979710394894209">"লাইভ ৱালপেপাৰ বাছনিকৰ্তা"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"লাইভ ৱালপেপাৰ বাছনি কৰক"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"লাইভ ৱালপেপাৰসমূহ"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"লাইভ ৱালপেপাৰৰ পূৰ্বদৰ্শন"</string>
- <string name="configure_wallpaper" msgid="7396598925806288258">"ছেটিংসমূহ…"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"ৱালপেপাৰ ছেট কৰক"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"কোনো লাইভ ৱালপেপাৰ নাই"</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"ৱালপেপাৰ ছেট কৰক"</string>
- <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g>ৰ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"লাইভ ৱালপেপাৰ ল\'ড কৰি থকা হৈছে…"</string>
- <string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"গৃহ স্ক্ৰীণ"</string>
- <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"গৃহ স্ক্ৰীণ আৰু লক স্ক্ৰীণ"</string>
- <string name="collapse_attribution_panel" msgid="4998500891743118630">"ৱালপেপাৰ সম্পৰ্কীয় তথ্য়ৰ পেনেল সংকুচিত কৰক"</string>
- <string name="expand_attribution_panel" msgid="3151357815478885438">"ৱালপেপাৰ সম্পৰ্কীয় তথ্য়ৰ পেনেল বিস্তাৰ কৰক"</string>
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index 718fc00..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2008 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4119979710394894209">"ଲାଇଭ୍ ୱାଲପେପର୍ ପିକର୍"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"ଲାଇଭ୍ ୱାଲପେପର୍ ଚୟନ କରନ୍ତୁ"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"ଲାଇଭ୍ ୱାଲପେପର୍"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"ଲାଇଭ୍ ୱାଲପେପରର ଝଲକ"</string>
- <string name="configure_wallpaper" msgid="7396598925806288258">"ସେଟିଙ୍ଗ..."</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"ୱାଲପେପର୍ ସେଟ୍ କରନ୍ତୁ"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"କୌଣସି ଲାଇଭ୍ ୱାଲପେପର୍ ନାହିଁ"</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"ୱାଲପେପର୍ ସେଟ୍ କରନ୍ତୁ"</string>
- <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>ଙ୍କ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"ଲାଇଭ୍ ୱାଲପେପରଗୁଡ଼ିକୁ ଲୋଡ୍ କରାଯାଉଛି..."</string>
- <string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ହୋମ୍ ସ୍କ୍ରୀନ୍"</string>
- <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ହୋମ୍ ସ୍କ୍ରୀନ୍ ଏବଂ ଲକ୍ ସ୍କ୍ରୀନ୍"</string>
- <string name="collapse_attribution_panel" msgid="4998500891743118630">"ୱାଲପେପର୍ ସୂଚନା ପ୍ୟାନେଲକୁ ଛୋଟ କରନ୍ତୁ"</string>
- <string name="expand_attribution_panel" msgid="3151357815478885438">"ୱାଲପେପର୍ ସୂଚନା ପ୍ୟାନେଲ୍ ବଢ଼ାନ୍ତୁ"</string>
-</resources>
