summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2019-03-22 18:36:01 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-22 18:36:01 -0700
commit7c732602aeae0823ccb96b3e51f3e4dc7323d8e4 (patch)
treeb32434d20344f322afc0ec4850cbf827c0e11430
parent37ce9ff7636d4d4ec0524122c841d4a8d6bc3a52 (diff)
parent4aca515f71fe8d7559883e8b2e782a0ac675296a (diff)
downloadCellBroadcastReceiver-7c732602aeae0823ccb96b3e51f3e4dc7323d8e4.tar.gz
Merge "Consolidate configurations"
am: 4aca515f71 Change-Id: Iac205553c73c27d6cf0d7b1d00e6e3d0390d6958
l---------res/values-mcc440-mnc511
-rw-r--r--res/values-mcc440-mnc51/config.xml24
l---------res/values-mcc440-mnc521
-rw-r--r--res/values-mcc440-mnc52/config.xml24
4 files changed, 2 insertions, 48 deletions
diff --git a/res/values-mcc440-mnc51 b/res/values-mcc440-mnc51
new file mode 120000
index 000000000..afae1afc3
--- /dev/null
+++ b/res/values-mcc440-mnc51
@@ -0,0 +1 @@
+values-mcc440-mnc50/ \ No newline at end of file
diff --git a/res/values-mcc440-mnc51/config.xml b/res/values-mcc440-mnc51/config.xml
deleted file mode 100644
index 24f889674..000000000
--- a/res/values-mcc440-mnc51/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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>
- <string-array name="etws_alerts_range_strings" translatable="false">
- <!-- 0x1100 for earthquake -->
- <item>0x1100:rat=gsm, emergency=true</item>
- <!-- 0xA003 for other purposes -->
- <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
- </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52 b/res/values-mcc440-mnc52
new file mode 120000
index 000000000..afae1afc3
--- /dev/null
+++ b/res/values-mcc440-mnc52
@@ -0,0 +1 @@
+values-mcc440-mnc50/ \ No newline at end of file
diff --git a/res/values-mcc440-mnc52/config.xml b/res/values-mcc440-mnc52/config.xml
deleted file mode 100644
index 24f889674..000000000
--- a/res/values-mcc440-mnc52/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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>
- <string-array name="etws_alerts_range_strings" translatable="false">
- <!-- 0x1100 for earthquake -->
- <item>0x1100:rat=gsm, emergency=true</item>
- <!-- 0xA003 for other purposes -->
- <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
- </string-array>
-</resources>