Merge "Fix build break on glibc hosts."
diff --git a/core/res/res/values-af-rZA/arrays.xml b/core/res/res/values-af-rZA/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-af-rZA/arrays.xml
rename to core/res/res/values-af-rZA/donottranslate-maps.xml
diff --git a/core/res/res/values-am-rET/arrays.xml b/core/res/res/values-am-rET/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-am-rET/arrays.xml
rename to core/res/res/values-am-rET/donottranslate-maps.xml
diff --git a/core/res/res/values-ar-rEG/arrays.xml b/core/res/res/values-ar-rEG/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ar-rEG/arrays.xml
rename to core/res/res/values-ar-rEG/donottranslate-maps.xml
diff --git a/core/res/res/values-ar-rIL/arrays.xml b/core/res/res/values-ar-rIL/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ar-rIL/arrays.xml
rename to core/res/res/values-ar-rIL/donottranslate-maps.xml
diff --git a/core/res/res/values-bg-rBG/arrays.xml b/core/res/res/values-bg-rBG/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-bg-rBG/arrays.xml
rename to core/res/res/values-bg-rBG/donottranslate-maps.xml
diff --git a/core/res/res/values-ca-rES/arrays.xml b/core/res/res/values-ca-rES/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ca-rES/arrays.xml
rename to core/res/res/values-ca-rES/donottranslate-maps.xml
diff --git a/core/res/res/values-cs-rCZ/arrays.xml b/core/res/res/values-cs-rCZ/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-cs-rCZ/arrays.xml
rename to core/res/res/values-cs-rCZ/donottranslate-maps.xml
diff --git a/core/res/res/values-da-rDK/arrays.xml b/core/res/res/values-da-rDK/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-da-rDK/arrays.xml
rename to core/res/res/values-da-rDK/donottranslate-maps.xml
diff --git a/core/res/res/values-de-rAT/arrays.xml b/core/res/res/values-de-rAT/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-de-rAT/arrays.xml
rename to core/res/res/values-de-rAT/donottranslate-maps.xml
diff --git a/core/res/res/values-de-rCH/arrays.xml b/core/res/res/values-de-rCH/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-de-rCH/arrays.xml
rename to core/res/res/values-de-rCH/donottranslate-maps.xml
diff --git a/core/res/res/values-de-rDE/arrays.xml b/core/res/res/values-de-rDE/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-de-rDE/arrays.xml
rename to core/res/res/values-de-rDE/donottranslate-maps.xml
diff --git a/core/res/res/values-de-rLI/arrays.xml b/core/res/res/values-de-rLI/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-de-rLI/arrays.xml
rename to core/res/res/values-de-rLI/donottranslate-maps.xml
diff --git a/core/res/res/values-el-rGR/arrays.xml b/core/res/res/values-el-rGR/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-el-rGR/arrays.xml
rename to core/res/res/values-el-rGR/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rAU/arrays.xml b/core/res/res/values-en-rAU/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rAU/arrays.xml
rename to core/res/res/values-en-rAU/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rCA/arrays.xml b/core/res/res/values-en-rCA/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rCA/arrays.xml
rename to core/res/res/values-en-rCA/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rGB/arrays.xml b/core/res/res/values-en-rGB/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rGB/arrays.xml
rename to core/res/res/values-en-rGB/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rIE/arrays.xml b/core/res/res/values-en-rIE/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rIE/arrays.xml
rename to core/res/res/values-en-rIE/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rIN/arrays.xml b/core/res/res/values-en-rIN/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rIN/arrays.xml
rename to core/res/res/values-en-rIN/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rNZ/arrays.xml b/core/res/res/values-en-rNZ/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rNZ/arrays.xml
rename to core/res/res/values-en-rNZ/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rSG/arrays.xml b/core/res/res/values-en-rSG/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rSG/arrays.xml
rename to core/res/res/values-en-rSG/donottranslate-maps.xml
diff --git a/core/res/res/values-en-rZA/arrays.xml b/core/res/res/values-en-rZA/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-en-rZA/arrays.xml
rename to core/res/res/values-en-rZA/donottranslate-maps.xml
diff --git a/core/res/res/values-es-rES/arrays.xml b/core/res/res/values-es-rES/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-es-rES/arrays.xml
rename to core/res/res/values-es-rES/donottranslate-maps.xml
diff --git a/core/res/res/values-fa-rIR/arrays.xml b/core/res/res/values-fa-rIR/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-fa-rIR/arrays.xml
rename to core/res/res/values-fa-rIR/donottranslate-maps.xml
diff --git a/core/res/res/values-fi-rFI/arrays.xml b/core/res/res/values-fi-rFI/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-fi-rFI/arrays.xml
rename to core/res/res/values-fi-rFI/donottranslate-maps.xml
diff --git a/core/res/res/values-fr-rBE/arrays.xml b/core/res/res/values-fr-rBE/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-fr-rBE/arrays.xml
rename to core/res/res/values-fr-rBE/donottranslate-maps.xml
diff --git a/core/res/res/values-fr-rCA/arrays.xml b/core/res/res/values-fr-rCA/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-fr-rCA/arrays.xml
rename to core/res/res/values-fr-rCA/donottranslate-maps.xml
diff --git a/core/res/res/values-fr-rCH/arrays.xml b/core/res/res/values-fr-rCH/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-fr-rCH/arrays.xml
rename to core/res/res/values-fr-rCH/donottranslate-maps.xml
diff --git a/core/res/res/values-fr-rFR/arrays.xml b/core/res/res/values-fr-rFR/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-fr-rFR/arrays.xml
rename to core/res/res/values-fr-rFR/donottranslate-maps.xml
diff --git a/core/res/res/values-hi-rIN/arrays.xml b/core/res/res/values-hi-rIN/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-hi-rIN/arrays.xml
rename to core/res/res/values-hi-rIN/donottranslate-maps.xml
diff --git a/core/res/res/values-hu-rHU/arrays.xml b/core/res/res/values-hu-rHU/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-hu-rHU/arrays.xml
rename to core/res/res/values-hu-rHU/donottranslate-maps.xml
diff --git a/core/res/res/values-in-rID/arrays.xml b/core/res/res/values-in-rID/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-in-rID/arrays.xml
rename to core/res/res/values-in-rID/donottranslate-maps.xml
diff --git a/core/res/res/values-it-rCH/arrays.xml b/core/res/res/values-it-rCH/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-it-rCH/arrays.xml
rename to core/res/res/values-it-rCH/donottranslate-maps.xml
diff --git a/core/res/res/values-it-rIT/arrays.xml b/core/res/res/values-it-rIT/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-it-rIT/arrays.xml
rename to core/res/res/values-it-rIT/donottranslate-maps.xml
diff --git a/core/res/res/values-iw-rIL/arrays.xml b/core/res/res/values-iw-rIL/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-iw-rIL/arrays.xml
rename to core/res/res/values-iw-rIL/donottranslate-maps.xml
diff --git a/core/res/res/values-ja-rJP/arrays.xml b/core/res/res/values-ja-rJP/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ja-rJP/arrays.xml
rename to core/res/res/values-ja-rJP/donottranslate-maps.xml
diff --git a/core/res/res/values-ko-rKR/arrays.xml b/core/res/res/values-ko-rKR/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ko-rKR/arrays.xml
rename to core/res/res/values-ko-rKR/donottranslate-maps.xml
diff --git a/core/res/res/values-lt-rLT/arrays.xml b/core/res/res/values-lt-rLT/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-lt-rLT/arrays.xml
rename to core/res/res/values-lt-rLT/donottranslate-maps.xml
diff --git a/core/res/res/values-lv-rLV/arrays.xml b/core/res/res/values-lv-rLV/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-lv-rLV/arrays.xml
rename to core/res/res/values-lv-rLV/donottranslate-maps.xml
diff --git a/core/res/res/values-mcc204/arrays.xml b/core/res/res/values-mcc204/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-mcc204/arrays.xml
rename to core/res/res/values-mcc204/donottranslate-maps.xml
diff --git a/core/res/res/values-mcc230/arrays.xml b/core/res/res/values-mcc230/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-mcc230/arrays.xml
rename to core/res/res/values-mcc230/donottranslate-maps.xml
diff --git a/core/res/res/values-mcc232/arrays.xml b/core/res/res/values-mcc232/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-mcc232/arrays.xml
rename to core/res/res/values-mcc232/donottranslate-maps.xml
diff --git a/core/res/res/values-mcc260/arrays.xml b/core/res/res/values-mcc260/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-mcc260/arrays.xml
rename to core/res/res/values-mcc260/donottranslate-maps.xml
diff --git a/core/res/res/values-mcc262/arrays.xml b/core/res/res/values-mcc262/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-mcc262/arrays.xml
rename to core/res/res/values-mcc262/donottranslate-maps.xml
diff --git a/core/res/res/values-ms-rMY/arrays.xml b/core/res/res/values-ms-rMY/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ms-rMY/arrays.xml
rename to core/res/res/values-ms-rMY/donottranslate-maps.xml
diff --git a/core/res/res/values-nb-rNO/arrays.xml b/core/res/res/values-nb-rNO/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-nb-rNO/arrays.xml
rename to core/res/res/values-nb-rNO/donottranslate-maps.xml
diff --git a/core/res/res/values-nl-rBE/arrays.xml b/core/res/res/values-nl-rBE/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-nl-rBE/arrays.xml
rename to core/res/res/values-nl-rBE/donottranslate-maps.xml
diff --git a/core/res/res/values-nl-rNL/arrays.xml b/core/res/res/values-nl-rNL/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-nl-rNL/arrays.xml
rename to core/res/res/values-nl-rNL/donottranslate-maps.xml
diff --git a/core/res/res/values-pl-rPL/arrays.xml b/core/res/res/values-pl-rPL/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-pl-rPL/arrays.xml
rename to core/res/res/values-pl-rPL/donottranslate-maps.xml
diff --git a/core/res/res/values-pt-rBR/arrays.xml b/core/res/res/values-pt-rBR/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-pt-rBR/arrays.xml
rename to core/res/res/values-pt-rBR/donottranslate-maps.xml
diff --git a/core/res/res/values-pt-rPT/arrays.xml b/core/res/res/values-pt-rPT/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-pt-rPT/arrays.xml
rename to core/res/res/values-pt-rPT/donottranslate-maps.xml
diff --git a/core/res/res/values-rm-rCH/arrays.xml b/core/res/res/values-rm-rCH/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-rm-rCH/arrays.xml
rename to core/res/res/values-rm-rCH/donottranslate-maps.xml
diff --git a/core/res/res/values-ro-rRO/arrays.xml b/core/res/res/values-ro-rRO/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ro-rRO/arrays.xml
rename to core/res/res/values-ro-rRO/donottranslate-maps.xml
diff --git a/core/res/res/values-ru-rRU/arrays.xml b/core/res/res/values-ru-rRU/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-ru-rRU/arrays.xml
rename to core/res/res/values-ru-rRU/donottranslate-maps.xml
diff --git a/core/res/res/values-sk-rSK/arrays.xml b/core/res/res/values-sk-rSK/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-sk-rSK/arrays.xml
rename to core/res/res/values-sk-rSK/donottranslate-maps.xml
diff --git a/core/res/res/values-sl-rSI/arrays.xml b/core/res/res/values-sl-rSI/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-sl-rSI/arrays.xml
rename to core/res/res/values-sl-rSI/donottranslate-maps.xml
diff --git a/core/res/res/values-sr-rRS/arrays.xml b/core/res/res/values-sr-rRS/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-sr-rRS/arrays.xml
rename to core/res/res/values-sr-rRS/donottranslate-maps.xml
diff --git a/core/res/res/values-sv-rSE/arrays.xml b/core/res/res/values-sv-rSE/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-sv-rSE/arrays.xml
rename to core/res/res/values-sv-rSE/donottranslate-maps.xml
diff --git a/core/res/res/values-sw-rTZ/arrays.xml b/core/res/res/values-sw-rTZ/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-sw-rTZ/arrays.xml
rename to core/res/res/values-sw-rTZ/donottranslate-maps.xml
diff --git a/core/res/res/values-th-rTH/arrays.xml b/core/res/res/values-th-rTH/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-th-rTH/arrays.xml
rename to core/res/res/values-th-rTH/donottranslate-maps.xml
diff --git a/core/res/res/values-tl-rPH/arrays.xml b/core/res/res/values-tl-rPH/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-tl-rPH/arrays.xml
rename to core/res/res/values-tl-rPH/donottranslate-maps.xml
diff --git a/core/res/res/values-tr-rTR/arrays.xml b/core/res/res/values-tr-rTR/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-tr-rTR/arrays.xml
rename to core/res/res/values-tr-rTR/donottranslate-maps.xml
diff --git a/core/res/res/values-uk-rUA/arrays.xml b/core/res/res/values-uk-rUA/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-uk-rUA/arrays.xml
rename to core/res/res/values-uk-rUA/donottranslate-maps.xml
diff --git a/core/res/res/values-vi-rVN/arrays.xml b/core/res/res/values-vi-rVN/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-vi-rVN/arrays.xml
rename to core/res/res/values-vi-rVN/donottranslate-maps.xml
diff --git a/core/res/res/values-zh-rCN/arrays.xml b/core/res/res/values-zh-rCN/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-zh-rCN/arrays.xml
rename to core/res/res/values-zh-rCN/donottranslate-maps.xml
diff --git a/core/res/res/values-zh-rTW/arrays.xml b/core/res/res/values-zh-rTW/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-zh-rTW/arrays.xml
rename to core/res/res/values-zh-rTW/donottranslate-maps.xml
diff --git a/core/res/res/values-zu-rZA/arrays.xml b/core/res/res/values-zu-rZA/donottranslate-maps.xml
similarity index 100%
rename from core/res/res/values-zu-rZA/arrays.xml
rename to core/res/res/values-zu-rZA/donottranslate-maps.xml
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index ce734fc..90ddc4b 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -338,16 +338,6 @@
         <item>#ffffffff</item>
     </array>
 
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>36149777</item>
-        <item>-95993398</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
     <!-- Used in LocalePicker -->
     <string-array translatable="false" name="special_locale_codes">
         <item>zh_CN</item>
diff --git a/core/res/res/values/donottranslate-maps.xml b/core/res/res/values/donottranslate-maps.xml
new file mode 100644
index 0000000..ee32f01
--- /dev/null
+++ b/core/res/res/values/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>36149777</item>
+        <item>-95993398</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>