Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/webview into cm-13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0

Android 6.0.1 release 22

10 files changed, 10 insertions, 36 deletions

diff --git a/chromium/listing/res/values-az-rAZ/strings.xml b/chromium/listing/res/values-az-rAZ/strings.xml
deleted file mode 100644
index 0060945..0000000
--- a/chromium/listing/res/values-az-rAZ/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (c) 2014 The Chromium Authors. All rights reserved.
-
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string>
-    <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chrome tərəfindən dəstəklənən, tətbiqlər üçün veb kontent"</string>
-    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview Chrome tərəfindən dəstəklənən sistem komponentidir ki, Android tətbiqlərinə veb kontentini göstərməyə icazə verir. Bu komponent cihazınıza öncədən quraşdırılıb və ən son güncəlləşmələrin və digər baq ləğvlərinin olması üçün daima güncəl saxlanılacaq."</string>
-</resources>
diff --git a/chromium/listing/res/values-bn-rBD/strings.xml b/chromium/listing/res/values-bn-rBD/strings.xml
index 93e4619..b8b4505 100644
--- a/chromium/listing/res/values-bn-rBD/strings.xml
+++ b/chromium/listing/res/values-bn-rBD/strings.xml
@@ -7,7 +7,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android সিস্টেম ওয়েবভিউ"</string>
+    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android সিস্টেম WebView"</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chrome কর্তৃক চালিত, অ্যাপ্লিকেশানগুলির জন্য ওয়েব সামগ্রী"</string>
-    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android ওয়েবভিউ হল Chrome কর্তৃক চালিত একটি সিস্টেম উপাদান যা Android অ্যাপ্লিকেশানগুলিকে ওয়েব সামগ্রীগুলির প্রদর্শন করতে মঞ্জুরি প্রদান করে৷ এই উপাদানটি আপনার ডিভাইসে আগে থেকেই ইনস্টল করা থাকে এবং আপনার কাছে আধুনিক সুরক্ষা আপডেট এবং অন্যান্য ত্রুটি সংশোধনগুলি আছে কিনা তা নিশ্চিত করতে সেটিকে আপ টু ডেট করে রাখা উচিৎ৷"</string>
+    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview হল Chrome কর্তৃক চালিত একটি সিস্টেম উপাদান যা Android অ্যাপ্লিকেশানগুলিকে ওয়েব সামগ্রীগুলির প্রদর্শন করতে মঞ্জুরি প্রদান করে৷ এই উপাদানটি আপনার ডিভাইসে আগে থেকেই ইনস্টল করা থাকে এবং আপনার কাছে আধুনিক সুরক্ষা আপডেট এবং অন্যান্য ত্রুটি সংশোধনগুলি আছে কিনা তা নিশ্চিত করতে সেটিকে আপ টু ডেট করে রাখা উচিৎ৷"</string>
 </resources>
diff --git a/chromium/listing/res/values-en-rAU/strings.xml b/chromium/listing/res/values-en-rAU/strings.xml
index d8936be..5a84206 100644
--- a/chromium/listing/res/values-en-rAU/strings.xml
+++ b/chromium/listing/res/values-en-rAU/strings.xml
@@ -7,7 +7,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android system WebView"</string>
+    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web content for apps, powered by Chrome"</string>
     <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is a system component powered by Chrome that allows Android apps to display web content. This component is pre-installed on your device and should be kept up to date to ensure that you have the latest security updates and other bug fixes."</string>
 </resources>
diff --git a/chromium/listing/res/values-en-rGB/strings.xml b/chromium/listing/res/values-en-rGB/strings.xml
index d8936be..5a84206 100644
--- a/chromium/listing/res/values-en-rGB/strings.xml
+++ b/chromium/listing/res/values-en-rGB/strings.xml
@@ -7,7 +7,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android system WebView"</string>
+    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web content for apps, powered by Chrome"</string>
     <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is a system component powered by Chrome that allows Android apps to display web content. This component is pre-installed on your device and should be kept up to date to ensure that you have the latest security updates and other bug fixes."</string>
 </resources>
diff --git a/chromium/listing/res/values-en-rIN/strings.xml b/chromium/listing/res/values-en-rIN/strings.xml
index d8936be..5a84206 100644
--- a/chromium/listing/res/values-en-rIN/strings.xml
+++ b/chromium/listing/res/values-en-rIN/strings.xml
@@ -7,7 +7,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android system WebView"</string>
+    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web content for apps, powered by Chrome"</string>
     <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is a system component powered by Chrome that allows Android apps to display web content. This component is pre-installed on your device and should be kept up to date to ensure that you have the latest security updates and other bug fixes."</string>
 </resources>
diff --git a/chromium/listing/res/values-gu-rIN/strings.xml b/chromium/listing/res/values-gu-rIN/strings.xml
index af8d7ff..ac68f3a 100644
--- a/chromium/listing/res/values-gu-rIN/strings.xml
+++ b/chromium/listing/res/values-gu-rIN/strings.xml
@@ -8,6 +8,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android સિસ્ટમ WebView"</string>
-    <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chrome દ્વારા સંચાલિત એપ્લિકેશનો માટે વેબ સામગ્રી"</string>
+    <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chrome દ્વારા સંચાલિત એપ્લિકેશન્સ માટે વેબ સામગ્રી"</string>
     <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview એ Chrome દ્વારા સંચાલિત એક સિસ્ટમ ઘટક છે જે Android એપ્લિકેશન્સને વેબ સામગ્રી પ્રદર્શિત કરવાની મંજૂરી આપે છે. તમારા ઉપકરણ પર આ ઘટક પૂર્વમાં સ્થાપિત છે અને તમારી પાસે નવીનતમ સુરક્ષા અપડેટ્સ અને અન્ય બગ ફિક્સેસ છે તેની ખાતરી કરવા માટે અપ ટૂ ડેટ રાખવું જોઈએ."</string>
 </resources>
diff --git a/chromium/listing/res/values-kn-rIN/strings.xml b/chromium/listing/res/values-kn-rIN/strings.xml
index 8baa392..dc9db21 100644
--- a/chromium/listing/res/values-kn-rIN/strings.xml
+++ b/chromium/listing/res/values-kn-rIN/strings.xml
@@ -9,5 +9,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android ಸಿಸ್ಟಂ ವೆಬ್‌ವೀಕ್ಷಣೆ"</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chrome ಸಂಚಾಲಿತ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ವೆಬ್ ವಿಷಯ"</string>
-    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android ವೆಬ್‌ವೀಕ್ಷಣೆಯು Android ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ವೆಬ್ ವಿಷಯವನ್ನು ಪ್ರದರ್ಶೀಸಲು ಅನುಮತಿಸುವ Chrome ನಿಂದ ಸಂಚಾಲಿತವಾಗಿರುವ ಸಿಸ್ಟಂನ ಅಂಶವಾಗಿದೆ. ಈ ಅಂಶವನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮೊದಲೇ ಸ್ಥಾಪಿಸಲಾಗಿದ್ದು ಮತ್ತು ನೀವು ಇತ್ತೀಚಿನ ಭದ್ರತೆ ಅಪ್‌ಡೇಟ್‌ಗಳು ಹಾಗೂ ಇತರೆ ದೋಷ ಪರಿಹಾರಗಳನ್ನು ಹೊಂದಿರುವಿರಿ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಲು ನವಿಕೃತವಾಗಿರಿಸಬೇಕಾಗಿದೆ."</string>
+    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android ವೆಬ್‌ವೀಕ್ಷಣೆಯು Android ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ವೆಬ್ ವಿಷಯವನ್ನು ಪ್ರದರ್ಶೀಸಲು ಅನುಮತಿಸುವ Chrome ನಿಂದ ಸಂಚಾಲಿತವಾಗಿರುವ ಸಿಸ್ಟಂನ ಅಂಶವಾಗಿದೆ. ಈ ಅಂಶವನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮೊದಲೇ ಸ್ಥಾಪಿಸಲಾಗಿದ್ದು ಮತ್ತು ನೀವು ಇತ್ತೀಚಿನ ಭದ್ರತೆ ನವೀಕರಣಗಳು ಹಾಗೂ ಇತರೆ ದೋಷ ಪರಿಹಾರಗಳನ್ನು ಹೊಂದಿರುವಿರಿ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಲು ನವಿಕೃತವಾಗಿರಿಸಬೇಕಾಗಿದೆ."</string>
 </resources>
diff --git a/chromium/listing/res/values-nl/strings.xml b/chromium/listing/res/values-nl/strings.xml
index b08d59d..d502d32 100644
--- a/chromium/listing/res/values-nl/strings.xml
+++ b/chromium/listing/res/values-nl/strings.xml
@@ -9,5 +9,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView voor Android"</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webcontent voor apps, mogelijk gemaakt door Chrome"</string>
-    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is een systeemcomponent dat mogelijk wordt gemaakt door Chrome en waarmee Android-apps webcontent kunnen weergeven. Dit component is vooraf geïnstalleerd op je apparaat en moet up-to-date blijven zodat u over de nieuwste beveiligingsupdates en andere bugfixes beschikt."</string>
+    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is een systeemcomponent dat mogelijk wordt gemaakt door Chrome en waarmee Android-apps webcontent kunnen weergeven. Dit component is vooraf geïnstalleerd op uw apparaat en moet up-to-date blijven zodat u over de nieuwste beveiligingsupdates en andere bugfixes beschikt."</string>
 </resources>
diff --git a/chromium/listing/res/values-pt-rBR/strings.xml b/chromium/listing/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 7f5d960..0000000
--- a/chromium/listing/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (c) 2014 The Chromium Authors. All rights reserved.
-
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Sistema Android WebView"</string>
-    <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Conteúdo da Web para apps, com tecnologia Chrome"</string>
-    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"O Android Webview é um componente do sistema com tecnologia Chrome que permite aos apps Android apresentarem conteúdo da Web. Este componente está pré-instalado em seu dispositivo e deve ser mantido atualizado para garantir que você tenha as atualizações de segurança mais recentes e outras correções de bugs."</string>
-</resources>
diff --git a/chromium/listing/res/values-sq-rAL/strings.xml b/chromium/listing/res/values-sq-rAL/strings.xml
index 15ba004..c41570a 100644
--- a/chromium/listing/res/values-sq-rAL/strings.xml
+++ b/chromium/listing/res/values-sq-rAL/strings.xml
@@ -7,7 +7,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView për sistemin Android"</string>
+    <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView e sistemit \"android\""</string>
     <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Përmbajtje uebi për aplikacione. Mundësuar nga Chrome."</string>
-    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"WebView për Android është një përbërës sistemi i mundësuar nga Chrome që lejon aplikacionet e llojit Android të shfaqin përmbajtje uebi. Ky përbërës është i instaluar paraprakisht në pajisjen tënde dhe duhet përditësuar në mënyrë që të kesh gjithnjë përditësimet më të fundit mbi sigurinë dhe rregullimet e defekteve në kode."</string>
+    <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"\"Android WebView\" është një përbërës sistemi i mundësuar nga Chrome, që lejon aplikacionet e llojit \"android\" të shfaqin përmbajtje uebi. Ky përbërës është i instaluar paraprakisht në pajisjen tënde dhe duhet përditësuar në mënyrë që të kesh gjithnjë përditësimet më të fundit të sigurisë dhe rregullime të defekteve në kod."</string>
 </resources>