Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I1695c227e7253e733c5a64227818d90cd136a9e6
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index 5322cae..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2014 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="app_label" msgid="7454398782183407432">"TV সঞ্চয়াগাৰ"</string>
-    <string name="permlab_readTvListings" msgid="5272001606068276291">"TVৰ সকলো কাৰ্যসূচী পঢ়ক"</string>
-    <string name="permdesc_readTvListings" msgid="1165157606059567535">"আপোনাৰ ডিভাইচত থকা TVৰ সকলো কাৰ্যসূচী পঢ়ক"</string>
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index ec4b5b3..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2014 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="app_label" msgid="7454398782183407432">"TV ଷ୍ଟୋରେଜ୍"</string>
-    <string name="permlab_readTvListings" msgid="5272001606068276291">"ସମସ୍ତ TV ତାଲିକାକୁ ପଢ଼ନ୍ତୁ"</string>
-    <string name="permdesc_readTvListings" msgid="1165157606059567535">"ଆପଣଙ୍କ ଡିଭାଇସ୍‍ରେ ଉପଲବ୍ଧ ଥିବା ସମସ୍ତ TV ତାଲିକାକୁ ପଢ଼ନ୍ତୁ"</string>
-</resources>