From 5014f281d7c1486663bd3da21813d8d83e916fe8 Mon Sep 17 00:00:00 2001
From: Simon Wilson <simonwilson@google.com>
Date: Fri, 1 Apr 2011 13:41:03 -0700
Subject: [PATCH] DO NOT MERGE Put additional update package names in
 config.xml

Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
---
 res/values/config.xml  | 20 ++++++++++++++++++++
 res/values/strings.xml |  4 +---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100755 res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100755
index 00000000000..04d27a08e24
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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">
+    <string name="additional_system_update" translatable="false"></string>
+    <string name="additional_system_update_menu" translatable="false"></string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cfc3b90cf02..82608473926 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2654,7 +2654,5 @@ found in the list of installed applications.</string>
     <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>
     <string name="status_wimax_mac_address">4G MAC address</string>
 
-    <string name="additional_system_update_settings_list_item_title"></string>
-    <string name="additional_system_update"></string>
-    <string name="additional_system_update_menu"></string>
+    <string name="additional_system_update_settings_list_item_title">Additional system updates</string>
 </resources>