diff options
| author | Bill Rassieur <rassb@google.com> | 2019-03-29 04:25:34 +0000 |
|---|---|---|
| committer | Bill Rassieur <rassb@google.com> | 2019-03-29 04:25:34 +0000 |
| commit | a9d0c818a75433070e6a83e4a2ca92a41c3ead7c (patch) | |
| tree | 8c978759870de821d14815b6d491e05d6e50cdd0 | |
| parent | f86f956af4df647532bd23539d47c68806033e15 (diff) | |
| parent | 60e14db51562c0b6024dfa36f1d18c55ce4d6285 (diff) | |
| download | CellBroadcastReceiver-a9d0c818a75433070e6a83e4a2ca92a41c3ead7c.tar.gz | |
Merge master@5406228 into git_qt-dev-plus-aosp.
Change-Id: I32f38ed7fe0cc6f4921fdc0efde6632f20c3a19d
BUG: 129345239
| 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> |