Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca572fb6 authored by Simon Wilson's avatar Simon Wilson Committed by Android (Google) Code Review
Browse files

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

parents b4bd78f5 5014f281
Loading
Loading
Loading
Loading

res/values/config.xml

0 → 100755
+20 −0
Original line number Diff line number Diff line
<?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>
+1 −3
Original line number Diff line number Diff line
@@ -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>