Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K

Android 6.0.1 release 22

3 files changed, 0 insertions, 24 deletions

diff --git a/tools/recovery_l10n/res/values-gu-rIN/strings.xml b/tools/recovery_l10n/res/values-gu-rIN/strings.xml
deleted file mode 100644
index a364b523c..000000000
--- a/tools/recovery_l10n/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recovery_installing" msgid="7864047928003865598">"સિસ્ટમ અપડેટ ઇન્સ્ટોલ કરી રહ્યાં છે…"</string>
-    <string name="recovery_erasing" msgid="4612809744968710197">"કાઢી નાખી રહ્યાં છે…"</string>
-    <string name="recovery_no_command" msgid="1915703879031023455">"કોઈ આદેશ નથી."</string>
-    <string name="recovery_error" msgid="4550265746256727080">"ભૂલ!"</string>
-</resources>
diff --git a/tools/recovery_l10n/res/values-pt-rBR/strings.xml b/tools/recovery_l10n/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 3cc57234e..000000000
--- a/tools/recovery_l10n/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recovery_installing" msgid="7864047928003865598">"Instalando atualização do sistema..."</string>
-    <string name="recovery_erasing" msgid="4612809744968710197">"Apagando..."</string>
-    <string name="recovery_no_command" msgid="1915703879031023455">"Nenhum comando."</string>
-    <string name="recovery_error" msgid="4550265746256727080">"Erro!"</string>
-</resources>
diff --git a/tools/recovery_l10n/res/values-sq-rAL/strings.xml b/tools/recovery_l10n/res/values-sq-rAL/strings.xml
deleted file mode 100644
index 29f8ef592..000000000
--- a/tools/recovery_l10n/res/values-sq-rAL/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recovery_installing" msgid="7864047928003865598">"Po instalon përditësimin e sistemit..."</string>
-    <string name="recovery_erasing" msgid="4612809744968710197">"Po spastron..."</string>
-    <string name="recovery_no_command" msgid="1915703879031023455">"Nuk ka komanda."</string>
-    <string name="recovery_error" msgid="4550265746256727080">"Gabim!"</string>
-</resources>