summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-01-08 00:50:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-08 00:50:16 +0000
commit080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b (patch)
tree7e5ede576b4e7db569c81a2004b2b84c91c9c551 /core
parent878df18c48fa5f0282cee5ded80238f64826cf84 (diff)
parent132a55375e89d809e1cc116aa4cca49e2351294a (diff)
downloadframeworks_base-080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b.zip
frameworks_base-080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b.tar.gz
frameworks_base-080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b.tar.bz2
am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '132a55375e89d809e1cc116aa4cca49e2351294a': Revert "Do not show roaming icon for Videotron operator when access Canada network"
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values-mcc302-mnc500/config.xml25
-rw-r--r--core/res/res/values-mcc302-mnc510/config.xml25
2 files changed, 0 insertions, 50 deletions
diff --git a/core/res/res/values-mcc302-mnc500/config.xml b/core/res/res/values-mcc302-mnc500/config.xml
deleted file mode 100644
index 706570c..0000000
--- a/core/res/res/values-mcc302-mnc500/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2013, 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">
- <!-- Don't use roaming icon for considered operators -->
- <string-array translatable="false" name="config_operatorConsideredNonRoaming">
- <item>302</item>
- </string-array>
-</resources>
diff --git a/core/res/res/values-mcc302-mnc510/config.xml b/core/res/res/values-mcc302-mnc510/config.xml
deleted file mode 100644
index 706570c..0000000
--- a/core/res/res/values-mcc302-mnc510/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2013, 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">
- <!-- Don't use roaming icon for considered operators -->
- <string-array translatable="false" name="config_operatorConsideredNonRoaming">
- <item>302</item>
- </string-array>
-</resources>