[automerger skipped] Import translations. DO NOT MERGE
am: 84a2c021ed -s ours
am skip reason: subject contains skip directive
Change-Id: I803f0759d9a8b533a84f1d62d76dda56ab8d6e22
diff --git a/res/values-mcc310-mnc410/config.xml b/res/values-mcc310-mnc410/config.xml
index 5435198..77b459d 100644
--- a/res/values-mcc310-mnc410/config.xml
+++ b/res/values-mcc310-mnc410/config.xml
@@ -19,4 +19,6 @@
<bool name="duplicate_compare_body">true</bool>
<!-- Whether to reset alert message duplicate detection after toggling airplane mode -->
<bool name="reset_duplicate_detection_on_airplane_mode">true</bool>
+ <!-- Show timestamp of the alert -->
+ <bool name="show_date_time_title">true</bool>
</resources>
diff --git a/res/values-mcc312-mnc670 b/res/values-mcc312-mnc670
new file mode 120000
index 0000000..2d21ee5
--- /dev/null
+++ b/res/values-mcc312-mnc670
@@ -0,0 +1 @@
+values-mcc313-mnc100
\ No newline at end of file
diff --git a/res/values-mcc313-mnc100/config.xml b/res/values-mcc313-mnc100/config.xml
new file mode 100644
index 0000000..423eaea
--- /dev/null
+++ b/res/values-mcc313-mnc100/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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>
+ <!-- Whether to compare message body when performing message duplicate dection -->
+ <bool name="duplicate_compare_body">true</bool>
+ <!-- Whether to reset alert message duplicate detection after toggling airplane mode -->
+ <bool name="reset_duplicate_detection_on_airplane_mode">true</bool>
+ <!-- Show timestamp of the alert -->
+ <bool name="show_date_time_title">true</bool>
+</resources>
+
diff --git a/res/values-mcc313-mnc110 b/res/values-mcc313-mnc110
new file mode 120000
index 0000000..2d21ee5
--- /dev/null
+++ b/res/values-mcc313-mnc110
@@ -0,0 +1 @@
+values-mcc313-mnc100
\ No newline at end of file
diff --git a/res/values-mcc313-mnc120 b/res/values-mcc313-mnc120
new file mode 120000
index 0000000..2d21ee5
--- /dev/null
+++ b/res/values-mcc313-mnc120
@@ -0,0 +1 @@
+values-mcc313-mnc100
\ No newline at end of file
diff --git a/res/values-mcc313-mnc130 b/res/values-mcc313-mnc130
new file mode 120000
index 0000000..2d21ee5
--- /dev/null
+++ b/res/values-mcc313-mnc130
@@ -0,0 +1 @@
+values-mcc313-mnc100
\ No newline at end of file
diff --git a/res/values-mcc313-mnc140 b/res/values-mcc313-mnc140
new file mode 120000
index 0000000..2d21ee5
--- /dev/null
+++ b/res/values-mcc313-mnc140
@@ -0,0 +1 @@
+values-mcc313-mnc100
\ No newline at end of file
diff --git a/res/values-mcc440-mnc50/config.xml b/res/values-mcc440-mnc50/config.xml
index ed9c1f9..922092d 100644
--- a/res/values-mcc440-mnc50/config.xml
+++ b/res/values-mcc440-mnc50/config.xml
@@ -23,7 +23,4 @@
<!-- 0xA808 for other purposes -->
<item>0xA808:rat=gsm, type=other, emergency=true, scope=carrier</item>
</string-array>
- <string-array name="additional_cbs_channels_strings" translatable="false">
- <item>0xA807:rat=gsm, emergency=false</item>
- </string-array>
</resources>