PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

Browse Source 
* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml
This commit is contained in:
Simon Wilson
2011-04-04 14:43:02 -07:00
committed by Android Git Automerger
parent 6735ae141f ca572fb64b
commit 2ca7add59f
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/values/config.xml Executable file
View File

@@ -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>

4
res/values/strings.xml
View File

@@ -2656,7 +2656,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>