diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-03-23 01:25:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-23 01:25:13 +0000 |
| commit | 4aca515f71fe8d7559883e8b2e782a0ac675296a (patch) | |
| tree | 43b9fc92312e40f2b0866aae08a4f972ac2c3d70 | |
| parent | 4465184ffbcf977eedcdec02f961d227fd71dbed (diff) | |
| parent | 8137f573e614e0bb1191a8bd3b963059904f7914 (diff) | |
| download | CellBroadcastReceiver-4aca515f71fe8d7559883e8b2e782a0ac675296a.tar.gz | |
Merge "Consolidate configurations"
| l--------- | res/values-mcc440-mnc51 | 1 | ||||
| -rw-r--r-- | res/values-mcc440-mnc51/config.xml | 24 | ||||
| l--------- | res/values-mcc440-mnc52 | 1 | ||||
| -rw-r--r-- | res/values-mcc440-mnc52/config.xml | 24 |
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> |