Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

5 files changed, 6 insertions, 6 deletions

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index eaf722b..7fb2328 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -52,7 +52,7 @@
     <string name="desc_switch_deg" msgid="6675211986921592374">"dərəcəyə keçid"</string>
     <string name="desc_switch_rad" msgid="2845875847488919914">"radiana keçid"</string>
     <string name="desc_eq" msgid="3349320880874699285">"bərabərlik"</string>
-    <string name="desc_clr" msgid="737502124268890797">"silin"</string>
+    <string name="desc_clr" msgid="737502124268890797">"təmizləyin"</string>
     <string name="desc_del" msgid="7879515781929311432">"silin"</string>
     <string name="desc_inv_off" msgid="3672218250519616068">"əks funksiyaları göstərin"</string>
     <string name="desc_inv_on" msgid="2515675590767677178">"əks funksiyaları gizlədin"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7e46f95..347e18b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -52,7 +52,7 @@
     <string name="desc_switch_deg" msgid="6675211986921592374">"Zu Grad wechseln"</string>
     <string name="desc_switch_rad" msgid="2845875847488919914">"Zu Radiant wechseln"</string>
     <string name="desc_eq" msgid="3349320880874699285">"ist gleich"</string>
-    <string name="desc_clr" msgid="737502124268890797">"Löschen"</string>
+    <string name="desc_clr" msgid="737502124268890797">"Entfernen"</string>
     <string name="desc_del" msgid="7879515781929311432">"Löschen"</string>
     <string name="desc_inv_off" msgid="3672218250519616068">"Umkehrfunktionen anzeigen"</string>
     <string name="desc_inv_on" msgid="2515675590767677178">"Umkehrfunktionen ausblenden"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6b24b1a..bddad90 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,7 +52,7 @@
     <string name="desc_switch_deg" msgid="6675211986921592374">"beralih ke derajat"</string>
     <string name="desc_switch_rad" msgid="2845875847488919914">"beralih ke radian"</string>
     <string name="desc_eq" msgid="3349320880874699285">"sama dengan"</string>
-    <string name="desc_clr" msgid="737502124268890797">"hapus"</string>
+    <string name="desc_clr" msgid="737502124268890797">"kosongkan"</string>
     <string name="desc_del" msgid="7879515781929311432">"hapus"</string>
     <string name="desc_inv_off" msgid="3672218250519616068">"tampilkan fungsi balikan"</string>
     <string name="desc_inv_on" msgid="2515675590767677178">"semunyikan fungsi balikan"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 309645b..81829c6 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -52,7 +52,7 @@
     <string name="desc_switch_deg" msgid="6675211986921592374">"badilisha hadi digrii"</string>
     <string name="desc_switch_rad" msgid="2845875847488919914">"badilisha hadi rediani"</string>
     <string name="desc_eq" msgid="3349320880874699285">"sawa na"</string>
-    <string name="desc_clr" msgid="737502124268890797">"futa"</string>
+    <string name="desc_clr" msgid="737502124268890797">"ondoa"</string>
     <string name="desc_del" msgid="7879515781929311432">"futa"</string>
     <string name="desc_inv_off" msgid="3672218250519616068">"Onyesha chaguo za kukokotoa za kinyume"</string>
     <string name="desc_inv_on" msgid="2515675590767677178">"ficha chaguo za kukokotoa za kinyume"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 775bde7..128736c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -52,8 +52,8 @@
     <string name="desc_switch_deg" msgid="6675211986921592374">"chuyển sang độ"</string>
     <string name="desc_switch_rad" msgid="2845875847488919914">"chuyển sang radian"</string>
     <string name="desc_eq" msgid="3349320880874699285">"bằng"</string>
-    <string name="desc_clr" msgid="737502124268890797">"xóa"</string>
-    <string name="desc_del" msgid="7879515781929311432">"xóa"</string>
+    <string name="desc_clr" msgid="737502124268890797">"xóa sạch"</string>
+    <string name="desc_del" msgid="7879515781929311432">"gạch bỏ"</string>
     <string name="desc_inv_off" msgid="3672218250519616068">"hiển thị hàm nghịch"</string>
     <string name="desc_inv_on" msgid="2515675590767677178">"ẩn hàm nghịch"</string>
     <string name="error_nan" msgid="5674077944929888710">"Không phải số"</string>