diff --git a/apct-tests/perftests/core/src/android/app/ResourcesPerfTest.java b/apct-tests/perftests/core/src/android/app/ResourcesPerfTest.java
index 72162448a2e06..b1f609ea77bdf 100644
--- a/apct-tests/perftests/core/src/android/app/ResourcesPerfTest.java
+++ b/apct-tests/perftests/core/src/android/app/ResourcesPerfTest.java
@@ -96,7 +96,7 @@ public class ResourcesPerfTest {
final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
TypedValue value = new TypedValue();
while (state.keepRunning()) {
- mRes.getValue(com.android.internal.R.string.mmcc_illegal_me, value,
+ mRes.getValue(com.android.internal.R.string.android_upgrading_apk, value,
false /* resolve_refs */);
}
}
diff --git a/core/res/res/layout/sms_short_code_confirmation_dialog.xml b/core/res/res/layout/sms_short_code_confirmation_dialog.xml
deleted file mode 100644
index d82f560fc3d08..0000000000000
--- a/core/res/res/layout/sms_short_code_confirmation_dialog.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/res/res/values-mcc001-mnc01/strings.xml b/core/res/res/values-mcc001-mnc01/strings.xml
deleted file mode 100644
index 96af975b50b51..0000000000000
--- a/core/res/res/values-mcc001-mnc01/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc001/config.xml b/core/res/res/values-mcc001/config.xml
deleted file mode 100644
index 93cde03ba6a0e..0000000000000
--- a/core/res/res/values-mcc001/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- true
-
diff --git a/core/res/res/values-mcc204-mnc04/config.xml b/core/res/res/values-mcc204-mnc04/config.xml
deleted file mode 100755
index 4a3bf22d61db5..0000000000000
--- a/core/res/res/values-mcc204-mnc04/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
- 1358
-
- true;BAE0000000000000
-
diff --git a/core/res/res/values-mcc204/config.xml b/core/res/res/values-mcc204/config.xml
deleted file mode 100644
index 790f768eaceed..0000000000000
--- a/core/res/res/values-mcc204/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- true
-
-
diff --git a/core/res/res/values-mcc219/config.xml b/core/res/res/values-mcc219/config.xml
deleted file mode 100644
index 7ae82fa91c95c..0000000000000
--- a/core/res/res/values-mcc219/config.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
- - "92"
- - "93"
- - "94"
- - "95"
- - "96"
-
-
-
diff --git a/core/res/res/values-mcc220/config.xml b/core/res/res/values-mcc220/config.xml
deleted file mode 100644
index 7ae82fa91c95c..0000000000000
--- a/core/res/res/values-mcc220/config.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
- - "92"
- - "93"
- - "94"
- - "95"
- - "96"
-
-
-
diff --git a/core/res/res/values-mcc234-mnc20/config.xml b/core/res/res/values-mcc234-mnc20/config.xml
deleted file mode 100644
index 224dc3113c1ba..0000000000000
--- a/core/res/res/values-mcc234-mnc20/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
- 1440
-
diff --git a/core/res/res/values-mcc235-mnc94/config.xml b/core/res/res/values-mcc235-mnc94/config.xml
index 38ae2a0dceab3..6a6b0e52224c9 100644
--- a/core/res/res/values-mcc235-mnc94/config.xml
+++ b/core/res/res/values-mcc235-mnc94/config.xml
@@ -31,8 +31,4 @@
- 9
-
- 1440
-
diff --git a/core/res/res/values-mcc240-mnc01/config.xml b/core/res/res/values-mcc240-mnc01/config.xml
deleted file mode 100644
index 7fb5c46309d0e..0000000000000
--- a/core/res/res/values-mcc240-mnc01/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
- false
-
-
diff --git a/core/res/res/values-mcc240-mnc05/config.xml b/core/res/res/values-mcc240-mnc05/config.xml
deleted file mode 100644
index 7fb5c46309d0e..0000000000000
--- a/core/res/res/values-mcc240-mnc05/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
- false
-
-
diff --git a/core/res/res/values-mcc302-mnc220/config.xml b/core/res/res/values-mcc302-mnc220/config.xml
deleted file mode 100644
index 0ae2b4d57be42..0000000000000
--- a/core/res/res/values-mcc302-mnc220/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
- 1410
-
-
diff --git a/core/res/res/values-mcc302-mnc370/config.xml b/core/res/res/values-mcc302-mnc370/config.xml
deleted file mode 100644
index ef32acd925d1d..0000000000000
--- a/core/res/res/values-mcc302-mnc370/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- 1410
-
-
diff --git a/core/res/res/values-mcc302-mnc610/config.xml b/core/res/res/values-mcc302-mnc610/config.xml
deleted file mode 100644
index 2b78f5586fb8e..0000000000000
--- a/core/res/res/values-mcc302-mnc610/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- 1428
-
-
diff --git a/core/res/res/values-mcc302-mnc660/config.xml b/core/res/res/values-mcc302-mnc660/config.xml
index beb233670c2d9..6b5c1cf4e855d 100644
--- a/core/res/res/values-mcc302-mnc660/config.xml
+++ b/core/res/res/values-mcc302-mnc660/config.xml
@@ -29,8 +29,5 @@
- 7
- 9
-
- 1430
diff --git a/core/res/res/values-mcc302-mnc720/config.xml b/core/res/res/values-mcc302-mnc720/config.xml
deleted file mode 100644
index 7be9a1c5231fb..0000000000000
--- a/core/res/res/values-mcc302-mnc720/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- 1430
-
-
diff --git a/core/res/res/values-mcc302-mnc780/config.xml b/core/res/res/values-mcc302-mnc780/config.xml
deleted file mode 100644
index d300dab31db17..0000000000000
--- a/core/res/res/values-mcc302-mnc780/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- 1358
-
-
diff --git a/core/res/res/values-mcc310-mnc004/config.xml b/core/res/res/values-mcc310-mnc004/config.xml
index a328c49cbc717..df1aed4036f19 100755
--- a/core/res/res/values-mcc310-mnc004/config.xml
+++ b/core/res/res/values-mcc310-mnc004/config.xml
@@ -34,10 +34,4 @@
- 83
- false
-
- true
-
- true
-
diff --git a/core/res/res/values-mcc310-mnc030/strings.xml b/core/res/res/values-mcc310-mnc030/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc310-mnc030/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc310-mnc120/config.xml b/core/res/res/values-mcc310-mnc120/config.xml
index 413c6980869fb..c92cb5732222c 100644
--- a/core/res/res/values-mcc310-mnc120/config.xml
+++ b/core/res/res/values-mcc310-mnc120/config.xml
@@ -21,38 +21,8 @@
for different hardware and product builds. -->
-
- 1422
-
false
-
-
- - 2
- - 74
- - 124
- - 125
- - 126
- - 157
- - 158
- - 159
- - 193
- - 194
- - 195
- - 196
- - 197
- - 198
- - 228
- - 229
- - 230
- - 231
- - 232
- - 233
- - 234
- - 235
-
-
diff --git a/core/res/res/values-mcc310-mnc150/config.xml b/core/res/res/values-mcc310-mnc150/config.xml
deleted file mode 100644
index e7d1325ff78a0..0000000000000
--- a/core/res/res/values-mcc310-mnc150/config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
- - "0"
- - "00"
- - "*0"
- - "*1"
- - "*2"
- - "*3"
- - "*4"
- - "*5"
- - "*6"
- - "*7"
- - "*8"
- - "*9"
- - "#0"
- - "#1"
- - "#2"
- - "#3"
- - "#4"
- - "#5"
- - "#6"
- - "#7"
- - "#8"
- - "#9"
-
-
diff --git a/core/res/res/values-mcc310-mnc150/strings.xml b/core/res/res/values-mcc310-mnc150/strings.xml
deleted file mode 100644
index 96af975b50b51..0000000000000
--- a/core/res/res/values-mcc310-mnc150/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc310-mnc160/config.xml b/core/res/res/values-mcc310-mnc160/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc160/config.xml
+++ b/core/res/res/values-mcc310-mnc160/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc170/strings.xml b/core/res/res/values-mcc310-mnc170/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc310-mnc170/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc310-mnc200/config.xml b/core/res/res/values-mcc310-mnc200/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc200/config.xml
+++ b/core/res/res/values-mcc310-mnc200/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc210/config.xml b/core/res/res/values-mcc310-mnc210/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc210/config.xml
+++ b/core/res/res/values-mcc310-mnc210/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc220/config.xml b/core/res/res/values-mcc310-mnc220/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc220/config.xml
+++ b/core/res/res/values-mcc310-mnc220/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc230/config.xml b/core/res/res/values-mcc310-mnc230/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc230/config.xml
+++ b/core/res/res/values-mcc310-mnc230/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc240/config.xml b/core/res/res/values-mcc310-mnc240/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc240/config.xml
+++ b/core/res/res/values-mcc310-mnc240/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc250/config.xml b/core/res/res/values-mcc310-mnc250/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc250/config.xml
+++ b/core/res/res/values-mcc310-mnc250/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc260/config.xml b/core/res/res/values-mcc310-mnc260/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc260/config.xml
+++ b/core/res/res/values-mcc310-mnc260/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc270/config.xml b/core/res/res/values-mcc310-mnc270/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc270/config.xml
+++ b/core/res/res/values-mcc310-mnc270/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc280/strings.xml b/core/res/res/values-mcc310-mnc280/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc310-mnc280/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc310-mnc300/config.xml b/core/res/res/values-mcc310-mnc300/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc300/config.xml
+++ b/core/res/res/values-mcc310-mnc300/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc310/config.xml b/core/res/res/values-mcc310-mnc310/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc310/config.xml
+++ b/core/res/res/values-mcc310-mnc310/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc380/strings.xml b/core/res/res/values-mcc310-mnc380/strings.xml
deleted file mode 100644
index a3fea29070f58..0000000000000
--- a/core/res/res/values-mcc310-mnc380/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
-
diff --git a/core/res/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc410/config.xml
index 3fb3f0f7e9ff0..626c6d134d17a 100644
--- a/core/res/res/values-mcc310-mnc410/config.xml
+++ b/core/res/res/values-mcc310-mnc410/config.xml
@@ -20,34 +20,6 @@
-
- 1410
-
-
- - "0"
- - "00"
- - "*0"
- - "*1"
- - "*2"
- - "*3"
- - "*4"
- - "*5"
- - "*6"
- - "*7"
- - "*8"
- - "*9"
- - "#0"
- - "#1"
- - "#2"
- - "#3"
- - "#4"
- - "#5"
- - "#6"
- - "#7"
- - "#8"
- - "#9"
-
true
diff --git a/core/res/res/values-mcc310-mnc410/strings.xml b/core/res/res/values-mcc310-mnc410/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc310-mnc410/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc310-mnc490/config.xml b/core/res/res/values-mcc310-mnc490/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc490/config.xml
+++ b/core/res/res/values-mcc310-mnc490/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc530/config.xml b/core/res/res/values-mcc310-mnc530/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc530/config.xml
+++ b/core/res/res/values-mcc310-mnc530/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc560/strings.xml b/core/res/res/values-mcc310-mnc560/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc310-mnc560/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc310-mnc580/config.xml b/core/res/res/values-mcc310-mnc580/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc580/config.xml
+++ b/core/res/res/values-mcc310-mnc580/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc590/config.xml b/core/res/res/values-mcc310-mnc590/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc590/config.xml
+++ b/core/res/res/values-mcc310-mnc590/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc640/config.xml b/core/res/res/values-mcc310-mnc640/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc640/config.xml
+++ b/core/res/res/values-mcc310-mnc640/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc660/config.xml b/core/res/res/values-mcc310-mnc660/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc660/config.xml
+++ b/core/res/res/values-mcc310-mnc660/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc800/config.xml b/core/res/res/values-mcc310-mnc800/config.xml
index 5a6a84bd06b39..39fd2e52f99e1 100644
--- a/core/res/res/values-mcc310-mnc800/config.xml
+++ b/core/res/res/values-mcc310-mnc800/config.xml
@@ -21,10 +21,6 @@
for different hardware and product builds. -->
-
- 1440
-
diff --git a/core/res/res/values-mcc310-mnc950/strings.xml b/core/res/res/values-mcc310-mnc950/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc310-mnc950/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc311-mnc180/strings.xml b/core/res/res/values-mcc311-mnc180/strings.xml
deleted file mode 100644
index 6a404d5cee5f4..0000000000000
--- a/core/res/res/values-mcc311-mnc180/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SIM not provisioned MM#2
- SIM not allowed MM#3
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml
index 336e30e45b006..eda91411650a3 100755
--- a/core/res/res/values-mcc311-mnc480/config.xml
+++ b/core/res/res/values-mcc311-mnc480/config.xml
@@ -34,12 +34,6 @@
provisioning, availability etc -->
true
- false
-
- true
-
- true
-
true
diff --git a/core/res/res/values-mcc311-mnc490/config.xml b/core/res/res/values-mcc311-mnc490/config.xml
deleted file mode 100644
index 836abdf39ab88..0000000000000
--- a/core/res/res/values-mcc311-mnc490/config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
- - 2
- - 74
- - 124
- - 125
- - 126
- - 157
- - 158
- - 159
- - 193
- - 194
- - 195
- - 196
- - 197
- - 198
- - 228
- - 229
- - 230
- - 231
- - 232
- - 233
- - 234
- - 235
-
-
-
diff --git a/core/res/res/values-mcc311-mnc870/config.xml b/core/res/res/values-mcc311-mnc870/config.xml
deleted file mode 100644
index f6aed1335d663..0000000000000
--- a/core/res/res/values-mcc311-mnc870/config.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
- 1422
-
-
-
- - 2
- - 74
- - 124
- - 125
- - 126
- - 157
- - 158
- - 159
- - 193
- - 194
- - 195
- - 196
- - 197
- - 198
- - 228
- - 229
- - 230
- - 231
- - 232
- - 233
- - 234
- - 235
-
-
-
diff --git a/core/res/res/values-mcc312-mnc530/config.xml b/core/res/res/values-mcc312-mnc530/config.xml
index 413c6980869fb..c92cb5732222c 100644
--- a/core/res/res/values-mcc312-mnc530/config.xml
+++ b/core/res/res/values-mcc312-mnc530/config.xml
@@ -21,38 +21,8 @@
for different hardware and product builds. -->
-
- 1422
-
false
-
-
- - 2
- - 74
- - 124
- - 125
- - 126
- - 157
- - 158
- - 159
- - 193
- - 194
- - 195
- - 196
- - 197
- - 198
- - 228
- - 229
- - 230
- - 231
- - 232
- - 233
- - 234
- - 235
-
-
diff --git a/core/res/res/values-mcc312-mnc670/strings.xml b/core/res/res/values-mcc312-mnc670/strings.xml
deleted file mode 100644
index 96af975b50b51..0000000000000
--- a/core/res/res/values-mcc312-mnc670/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc313-mnc100/config.xml b/core/res/res/values-mcc313-mnc100/config.xml
deleted file mode 100644
index ccd03f10616ae..0000000000000
--- a/core/res/res/values-mcc313-mnc100/config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
- - "0"
- - "00"
- - "*0"
- - "*1"
- - "*2"
- - "*3"
- - "*4"
- - "*5"
- - "*6"
- - "*7"
- - "*8"
- - "*9"
- - "#0"
- - "#1"
- - "#2"
- - "#3"
- - "#4"
- - "#5"
- - "#6"
- - "#7"
- - "#8"
- - "#9"
-
-
diff --git a/core/res/res/values-mcc313-mnc100/strings.xml b/core/res/res/values-mcc313-mnc100/strings.xml
deleted file mode 100644
index 96af975b50b51..0000000000000
--- a/core/res/res/values-mcc313-mnc100/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Phone not allowed MM#6
-
diff --git a/core/res/res/values-mcc334-mnc020/config.xml b/core/res/res/values-mcc334-mnc020/config.xml
deleted file mode 100644
index 0970517835b6f..0000000000000
--- a/core/res/res/values-mcc334-mnc020/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
\ No newline at end of file
diff --git a/core/res/res/values-mcc334-mnc050/config.xml b/core/res/res/values-mcc334-mnc050/config.xml
index 23678f15fba33..876c26e7f629e 100644
--- a/core/res/res/values-mcc334-mnc050/config.xml
+++ b/core/res/res/values-mcc334-mnc050/config.xml
@@ -30,9 +30,4 @@
- 7
- 9
-
-
-
- - "#9"
-
diff --git a/core/res/res/values-mcc334-mnc090/config.xml b/core/res/res/values-mcc334-mnc090/config.xml
deleted file mode 100644
index 1632a42399234..0000000000000
--- a/core/res/res/values-mcc334-mnc090/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
- - "#9"
-
-
diff --git a/core/res/res/values-mcc415-mnc01/config.xml b/core/res/res/values-mcc415-mnc01/config.xml
deleted file mode 100644
index 95d30a4875766..0000000000000
--- a/core/res/res/values-mcc415-mnc01/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc416-mnc77/config.xml b/core/res/res/values-mcc416-mnc77/config.xml
deleted file mode 100644
index 95d30a4875766..0000000000000
--- a/core/res/res/values-mcc416-mnc77/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc425/config.xml b/core/res/res/values-mcc425/config.xml
deleted file mode 100644
index 95d30a4875766..0000000000000
--- a/core/res/res/values-mcc425/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc432-mnc20/config.xml b/core/res/res/values-mcc432-mnc20/config.xml
deleted file mode 100644
index 95d30a4875766..0000000000000
--- a/core/res/res/values-mcc432-mnc20/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc432/config.xml b/core/res/res/values-mcc432/config.xml
deleted file mode 100644
index 95d30a4875766..0000000000000
--- a/core/res/res/values-mcc432/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc440-mnc20/config.xml b/core/res/res/values-mcc440-mnc20/config.xml
deleted file mode 100644
index 62001d904482b..0000000000000
--- a/core/res/res/values-mcc440-mnc20/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
- 1422
-
-
diff --git a/core/res/res/values-mcc440-mnc50/config.xml b/core/res/res/values-mcc440-mnc50/config.xml
deleted file mode 100644
index fa5cba43c3dca..0000000000000
--- a/core/res/res/values-mcc440-mnc50/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
- 1420
-
-
diff --git a/core/res/res/values-mcc440-mnc54/config.xml b/core/res/res/values-mcc440-mnc54/config.xml
deleted file mode 100644
index fa5cba43c3dca..0000000000000
--- a/core/res/res/values-mcc440-mnc54/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
- 1420
-
-
diff --git a/core/res/res/values-mcc450-mnc05/config.xml b/core/res/res/values-mcc450-mnc05/config.xml
deleted file mode 100644
index d602c9fa634c6..0000000000000
--- a/core/res/res/values-mcc450-mnc05/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
- 1440
-
-
diff --git a/core/res/res/values-mcc450-mnc06/config.xml b/core/res/res/values-mcc450-mnc06/config.xml
deleted file mode 100644
index 819c2a5f15233..0000000000000
--- a/core/res/res/values-mcc450-mnc06/config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
- 1428
-
-
- false
-
-
diff --git a/core/res/res/values-mcc450-mnc08/config.xml b/core/res/res/values-mcc450-mnc08/config.xml
index 5edbaed11152f..52dd79a33c4aa 100644
--- a/core/res/res/values-mcc450-mnc08/config.xml
+++ b/core/res/res/values-mcc450-mnc08/config.xml
@@ -21,13 +21,6 @@
for different hardware and product builds. -->
-
- 1450
-
-
- false
-
-
- false
-
diff --git a/core/res/res/values-mcc466-mnc02/config.xml b/core/res/res/values-mcc466-mnc02/config.xml
deleted file mode 100644
index 3c379d14ce04e..0000000000000
--- a/core/res/res/values-mcc466-mnc02/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc466-mnc03/config.xml b/core/res/res/values-mcc466-mnc03/config.xml
deleted file mode 100644
index 3c379d14ce04e..0000000000000
--- a/core/res/res/values-mcc466-mnc03/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc466-mnc06/config.xml b/core/res/res/values-mcc466-mnc06/config.xml
deleted file mode 100644
index 3c379d14ce04e..0000000000000
--- a/core/res/res/values-mcc466-mnc06/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc466-mnc07/config.xml b/core/res/res/values-mcc466-mnc07/config.xml
deleted file mode 100644
index 3c379d14ce04e..0000000000000
--- a/core/res/res/values-mcc466-mnc07/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc466-mnc11/config.xml b/core/res/res/values-mcc466-mnc11/config.xml
deleted file mode 100644
index 3c379d14ce04e..0000000000000
--- a/core/res/res/values-mcc466-mnc11/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc466-mnc92/config.xml b/core/res/res/values-mcc466-mnc92/config.xml
deleted file mode 100644
index 3c379d14ce04e..0000000000000
--- a/core/res/res/values-mcc466-mnc92/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- false
-
diff --git a/core/res/res/values-mcc505-mnc01/config.xml b/core/res/res/values-mcc505-mnc01/config.xml
index bc088d1df6401..2e8c504f7d8ec 100644
--- a/core/res/res/values-mcc505-mnc01/config.xml
+++ b/core/res/res/values-mcc505-mnc01/config.xml
@@ -31,8 +31,4 @@
- 9
-
- 1400
-
diff --git a/core/res/res/values-mcc510-mnc08/config.xml b/core/res/res/values-mcc510-mnc08/config.xml
deleted file mode 100644
index 58fbb9ea44de5..0000000000000
--- a/core/res/res/values-mcc510-mnc08/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/core/res/res/values-mcc510-mnc89/config.xml b/core/res/res/values-mcc510-mnc89/config.xml
deleted file mode 100644
index c262247f2a88b..0000000000000
--- a/core/res/res/values-mcc510-mnc89/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/core/res/res/values-mcc704-mnc01/config.xml b/core/res/res/values-mcc704-mnc01/config.xml
deleted file mode 100644
index 10b647044c73a..0000000000000
--- a/core/res/res/values-mcc704-mnc01/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- - "*1"
- - "*5"
- - "*9"
-
-
diff --git a/core/res/res/values-mcc708-mnc001/config.xml b/core/res/res/values-mcc708-mnc001/config.xml
deleted file mode 100755
index 7b7c48d46b140..0000000000000
--- a/core/res/res/values-mcc708-mnc001/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- - "*1"
- - "*5"
-
-
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index deb6afcfa3b4c..448cf2fee4fa6 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -185,20 +185,4 @@
- @string/app_info
-
-
-
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bbe9a6d0de658..e2c912723068d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -108,12 +108,6 @@
any other apn from connecting until ims apn is connected-->
false
-
- true
-
@@ -476,10 +470,6 @@
-->
-
- com.android.cellbroadcastservice
-
-
false
-
- false
-
-
- @null
-
true
@@ -1847,9 +1831,6 @@
that has declared it can process the call's handle. -->
false
-
- true
-
8.8.8.8
-
-
-
@@ -1931,13 +1908,6 @@
false
-
- true
-
-
-
- false
-
4
@@ -2023,10 +1993,6 @@
a keyboard is present. -->
false
-
-
-
-
false
@@ -2035,12 +2001,6 @@
If false, Content-disposition fragments are ignored -->
true
-
-
-
-
-
-
false
-
-
- false
-
-3700
-
- 1500
-
-
-
-
-
524288,1048576,3145728,524288,1048576,2097152
@@ -2516,19 +2457,6 @@
false
-
- false
-
-
- false
-
-
- false
-
@@ -2616,10 +2544,6 @@
com.android.vpndialogs/com.android.vpndialogs.AlwaysOnDisconnectedDialog
-
- com.android.simappdialog/com.android.simappdialog.InstallCarrierAppActivity
-
;com.android.settings;
@@ -2671,41 +2595,10 @@
0x00000051
-
- true
-
5000
-
- -1
-
-
-
- - 33
- - 331
- - 332
- - 35
- - 351
- - 330
- - 333
- - 353
-
-
-
-
- - 33
- - 331
- - 332
- - 35
- - 351
- - 330
- - 333
- - 353
-
-
120
-
-
-
-
-
-
-
-
-
-
- - 0,modem,0,0,0,1,1,1
-
- - 1,sim,0,modem
-
-
@@ -2910,18 +2754,11 @@
-
- true
-
true
-
- false
-
@@ -2930,49 +2767,19 @@
true
-
- false
-
-
- true
-
false
-
- false
-
false
-
- false
-
-
- com.android.phone
-
-
-
-
-
-
-
-
-
-
true
@@ -3002,8 +2809,6 @@
- 20404;suffix;BAE0000000000000
- true
-
0
@@ -3044,20 +2849,8 @@
- 732101
-
- true
-
false
-
- 1
-
- -140
@@ -3090,17 +2883,6 @@
is the max width/height allowed in dips.-->
320dp
- false
-
-
-
-
-
- false
-
-
- true
-
true
@@ -3150,12 +2932,6 @@
false
-
-
-
false
-
-
-
-
1
@@ -3501,15 +3270,6 @@
UI is handled by ActivityManagerService -->
false
-
-
-
- - 310004,310010,310012,310013,310590,310890,310910,311110,311270,311271,311272,311273,311274,311275,311276,311277,311278,311279,311280,311281,311282,311283,311284,311285,311286,311287,311288,311289,311390,311480,311481,311482,311483,311484,311485,311486,311487,311488,311489;^//VZWVVM.*
-
-
2048
-
- false
-
false
@@ -3811,14 +3566,6 @@
-1
-1
-
-
- - "DE"
- - "GB"
- - "JP"
-
-
@@ -3866,25 +3613,6 @@
true
true
-
-
- com.android.phone
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- "wifi"
@@ -3963,9 +3691,6 @@
false
-
- false
-
false
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index e6a93e550a5fa..1fd2b3ab6b188 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -54,235 +54,6 @@
MSISDN1
-
-
- Connection problem or invalid MMI code.
-
- Operation is restricted to fixed dialing numbers only.
-
- Can not change call forwarding settings from your phone while you are roaming.
-
-
- Service was enabled.
-
- Service was enabled for:
-
- Service has been disabled.
-
- Registration was successful.
-
- Erasure was successful.
-
- Incorrect password.
-
- MMI complete.
-
- The old PIN you typed isn\'t correct.
-
- The PUK you typed isn\'t correct.
-
- The PINs you typed don\'t match.
-
- Type a PIN that is 4 to 8 numbers.
-
- Type a PUK that is 8 numbers or longer.
-
- Your SIM card is PUK-locked. Type the PUK code to unlock it.
- Type PUK2 to unblock SIM card.
-
- Unsuccessful, enable SIM/RUIM Lock.
-
-
- - You have %d remaining attempt before SIM is locked.
- - You have %d remaining attempts before SIM is locked.
-
-
- IMEI
-
-
- MEID
-
-
- Incoming Caller ID
-
- Outgoing Caller ID
-
- Connected Line ID
-
- Connected Line ID Restriction
-
- Call forwarding
-
- Call waiting
-
- Call barring
-
- Password change
-
- PIN change
- Calling number present
- Calling number restricted
- Three way calling
- Rejection of undesired annoying calls
- Calling number delivery
- Do not disturb
-
-
- Caller ID defaults to restricted. Next call: Restricted
-
- Caller ID defaults to restricted. Next call: Not restricted
-
- Caller ID defaults to not restricted. Next call: Restricted
-
- Caller ID defaults to not restricted. Next call: Not restricted
-
-
-
- Service not provisioned.
-
- You can\'t change the caller ID setting.
-
-
- No mobile data service
-
- Emergency calling unavailable
-
- No voice service
-
- No voice service or emergency calling
-
-
- Temporarily turned off by your carrier
-
-
- Temporarily turned off by your carrier for SIM %d
-
-
- Can\u2019t reach mobile network
-
- Try changing preferred network. Tap to change.
-
- Emergency calling unavailable
-
- Can\u2019t make emergency calls over Wi\u2011Fi
-
-
- Alerts
-
- Call forwarding
-
- Emergency callback mode
-
- Mobile data status
-
- SMS messages
-
- Voicemail messages
-
- Wi-Fi calling
-
- SIM status
-
- High priority SIM status
-
-
-
- Peer requested TTY Mode FULL
- Peer requested TTY Mode HCO
- Peer requested TTY Mode VCO
- Peer requested TTY Mode OFF
-
-
-
- Voice
-
- Data
-
- FAX
-
- SMS
-
- Async
-
- Sync
-
- Packet
-
- PAD
-
-
-
- Roaming Indicator On
- Roaming Indicator Off
- Roaming Indicator Flashing
- Out of Neighborhood
- Out of Building
- Roaming - Preferred System
- Roaming - Available System
- Roaming - Alliance Partner
- Roaming - Premium Partner
- Roaming - Full Service Functionality
- Roaming - Partial Service Functionality
- Roaming Banner On
- Roaming Banner Off
- Searching for Service
-
-
- Couldn\u2019t set up Wi\u2011Fi calling
-
-
- - To make calls and send messages over Wi-Fi, first ask your carrier to set up this service. Then turn on Wi-Fi calling again from Settings. (Error code: %1$s)
-
-
-
- - Issue registering Wi\u2011Fi calling with your carrier: %1$s
-
-
-
- - @string/wfcSpnFormat_spn
- - @string/wfcSpnFormat_spn_wifi_calling
- - @string/wfcSpnFormat_wlan_call
- - @string/wfcSpnFormat_spn_wlan_call
- - @string/wfcSpnFormat_spn_wifi
- - @string/wfcSpnFormat_wifi_calling_bar_spn
- - @string/wfcSpnFormat_spn_vowifi
- - @string/wfcSpnFormat_wifi_calling
- - @string/wfcSpnFormat_wifi
- - @string/wfcSpnFormat_wifi_calling_wo_hyphen
- - @string/wfcSpnFormat_vowifi
- - @string/wfcSpnFormat_spn_wifi_calling_vo_hyphen
-
-
-
- %s
-
- %s Wi-Fi Calling
-
- %s WiFi Calling
-
- WLAN Call
-
- %s WLAN Call
-
- %s Wi-Fi
-
- WiFi Calling | %s
-
- %s VoWifi
-
- Wi-Fi Calling
-
- Wi-Fi
-
- WiFi Calling
-
- VoWifi
-
Off
@@ -292,25 +63,6 @@
Wi-Fi only
-
-
- {0}: Not forwarded
-
- {0}: {1}
-
- {0}: {1} after {2} seconds
-
- {0}: Not forwarded
-
- {0}: Not forwarded
-
Feature code complete.
@@ -3418,62 +3170,8 @@
Insert character
-
-
-
- Sending SMS messages
-
- <b>%1$s</b> is sending a large number of SMS messages. Do you want to allow this app to continue sending messages?
-
- Allow
-
- Deny
-
-
-
- <b>%1$s</b> would like to send a message to <b>%2$s</b>.
-
- This may cause charges on your mobile account.
-
- This will cause charges on your mobile account.
-
- Send
-
- Cancel
-
- Remember my choice
-
- You can change this later in Settings\u00A0>\u00A0Apps"
-
-
- Always Allow
-
- Never Allow
-
-
-
- SIM card removed
-
- The mobile network will be unavailable until you restart with a valid SIM card inserted.
-
- Done
-
- SIM card added
-
- Restart your device to access the mobile network.
Restart
-
- Activate mobile service
-
- Download the carrier app to activate your new SIM
-
- Download the %1$s app to activate your new SIM
-
- Download app
-
- New SIM inserted
- Tap to set it up
@@ -3768,12 +3466,6 @@
Create contact\nusing %s
-
-
-
-
-
-
The following one or more apps request permission to access your account, now and in the future.
Do you want to allow this request?
Access request
@@ -3808,9 +3500,6 @@
importance of the user's notifications. -->
Notification ranker service
-
- /data/eri.xml
-
VPN activated
@@ -4112,15 +3801,6 @@
Share with
-
- Sending\u2026
-
-
- Launch Browser?
-
-
- Accept call?
-
Always
@@ -4839,17 +4519,6 @@
There\'s an internal problem with your device. Contact your manufacturer for details.
-
- USSD request changed to regular call
- USSD request changed to SS request
- Changed to new USSD request
- USSD request changed to video call
- SS request changed to regular call
- SS request changed to video call
- SS request changed to USSD request
- Changed to new SS request
-
Work profile
@@ -4959,11 +4628,6 @@
Check for update
-
- You have new messages
-
- Open SMS app to view
-
Some functionality may be limited
@@ -4999,9 +4663,6 @@
Disabled %1$s
-
- Conference Call
-
Tooltip
@@ -5138,18 +4799,6 @@
-
- SIM not allowed for voice
- SIM not provisioned for voice
- SIM not allowed for voice
- Phone not allowed for voice
-
-
- SIM %d not allowed
- SIM %d not provisioned
- SIM %d not allowed
- SIM %d not allowed
-
Popup Window
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 500bfe9e9265c..b627a46a9e4f2 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -18,7 +18,6 @@
@@ -221,11 +220,6 @@
-
-
-
-
-
@@ -251,7 +245,6 @@
-
@@ -283,7 +276,6 @@
-
@@ -296,18 +288,7 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -326,10 +307,8 @@
-
-
@@ -351,9 +330,6 @@
-
-
-
@@ -458,10 +434,7 @@
-
-
-
@@ -470,12 +443,9 @@
-
-
-
@@ -519,7 +489,6 @@
-
@@ -573,47 +542,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -674,8 +608,6 @@
-
-
@@ -690,11 +622,6 @@
-
-
-
-
-
@@ -702,10 +629,7 @@
-
-
-
@@ -797,7 +721,6 @@
-
@@ -813,7 +736,6 @@
-
@@ -830,16 +752,8 @@
-
-
-
-
-
-
-
-
@@ -854,14 +768,9 @@
-
-
-
-
-
@@ -883,10 +792,6 @@
-
-
-
-
@@ -925,7 +830,6 @@
-
@@ -960,41 +864,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1002,10 +877,6 @@
-
-
-
-
@@ -1013,18 +884,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1069,8 +928,6 @@
-
-
@@ -1081,14 +938,6 @@
-
-
-
-
-
-
-
-
@@ -1225,21 +1074,15 @@
-
-
-
-
-
-
@@ -1250,11 +1093,7 @@
-
-
-
-
@@ -1270,7 +1109,6 @@
-
@@ -1407,7 +1245,6 @@
-
@@ -1416,11 +1253,9 @@
-
-
@@ -1442,13 +1277,11 @@
-
-
@@ -1464,7 +1297,6 @@
-
@@ -1550,7 +1382,6 @@
-
@@ -1562,14 +1393,11 @@
-
-
-
@@ -1584,12 +1412,10 @@
-
-
@@ -1614,7 +1440,6 @@
-
@@ -1629,10 +1454,8 @@
-
-
@@ -1658,7 +1481,6 @@
-
@@ -1805,7 +1627,6 @@
-
@@ -1813,7 +1634,6 @@
-
@@ -2083,14 +1903,6 @@
-
-
-
-
-
-
-
-
@@ -2156,11 +1968,9 @@
-
-
@@ -2169,7 +1979,6 @@
-
@@ -2184,9 +1993,7 @@
-
-
@@ -2199,7 +2006,6 @@
-
@@ -2236,13 +2042,10 @@
-
-
-
@@ -2262,9 +2065,7 @@
-
-
@@ -2276,10 +2077,8 @@
-
-
@@ -2290,29 +2089,21 @@
-
-
-
-
-
-
-
-
@@ -2327,29 +2118,23 @@
-
-
-
-
-
-
@@ -2362,7 +2147,6 @@
-
@@ -2404,10 +2188,8 @@
-
-
@@ -2420,16 +2202,12 @@
-
-
-
-
@@ -2437,7 +2215,6 @@
-
@@ -2459,11 +2236,9 @@
-
-
@@ -2504,9 +2279,7 @@
-
-
@@ -2514,10 +2287,8 @@
-
-
@@ -2537,17 +2308,11 @@
-
-
-
-
-
-
@@ -2590,7 +2355,6 @@
-
@@ -2600,7 +2364,6 @@
-
@@ -2608,46 +2371,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2655,14 +2400,12 @@
-
-
@@ -2671,7 +2414,6 @@
-
@@ -2700,7 +2442,6 @@
-
@@ -2718,7 +2459,6 @@
-
@@ -2749,23 +2489,19 @@
-
-
-
-
@@ -2782,15 +2518,9 @@
-
-
-
-
-
-
@@ -2798,11 +2528,7 @@
-
-
-
-
@@ -2815,7 +2541,6 @@
-
@@ -2823,14 +2548,12 @@
-
-
@@ -2863,18 +2586,15 @@
-
-
-
@@ -2909,7 +2629,6 @@
-
@@ -2921,30 +2640,19 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -2953,7 +2661,6 @@
-
@@ -2962,55 +2669,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3019,87 +2704,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3124,7 +2785,6 @@
-
@@ -3148,46 +2808,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3195,7 +2842,6 @@
-
@@ -3204,9 +2850,7 @@
-
-
@@ -3217,10 +2861,8 @@
-
-
@@ -3232,7 +2874,6 @@
-
@@ -3243,19 +2884,15 @@
-
-
-
-
@@ -3315,12 +2952,10 @@
-
-
@@ -3328,7 +2963,6 @@
-
@@ -3336,15 +2970,12 @@
-
-
-
@@ -3363,10 +2994,8 @@
-
-
@@ -3376,16 +3005,12 @@
-
-
-
-
@@ -3419,29 +3044,22 @@
-
-
-
-
-
-
-
@@ -3449,17 +3067,13 @@
-
-
-
-
@@ -3472,24 +3086,19 @@
-
-
-
-
-
@@ -3514,11 +3123,8 @@
-
-
-
@@ -3533,80 +3139,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3623,50 +3207,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3674,13 +3244,10 @@
-
-
-
@@ -3688,23 +3255,15 @@
-
-
-
-
-
-
-
-
@@ -3728,7 +3287,6 @@
-
@@ -3748,19 +3306,15 @@
-
-
-
-
@@ -3770,16 +3324,13 @@
-
-
-
@@ -3790,37 +3341,26 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -3832,43 +3372,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3895,12 +3423,9 @@
-
-
-