Merge "vendor/cm: We are at CM11 now" into cm-11.0
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 2e0f5f7..67a3240 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -72,15 +72,9 @@
* __Samsung Galaxy S II (AT&T) (SGH-I777):__
* __Samsung Galaxy S II (intl) (GT-I9100):__ codeworkx, Espenfjo
* __Samsung Galaxy S II (intl) (GT-I9100G):__ codeworkx, Jiangyi, Ryuinferno
-* __Samsung Galaxy S III (AT&T) (SGH-I747):__ cyanogen
-* __Samsung Galaxy S III (Cricket) (SCH-R530):__ noobnl
+* __Samsung Galaxy S III (AT&T) (SGH-I747):__ cyanogen, invisiblek, mkasick, nardholio, noobnl
* __Samsung Galaxy S III (intl) (GT-I9300):__ codeworkx
* __Samsung Galaxy S III LTE (GT-I9305):__ mcampbellsmith, codeworkx
-* __Samsung Galaxy S III (MetroPCS) (SCH-R530):__ noobnl
-* __Samsung Galaxy S III (Sprint) (SPH-L710):__ mkasick, noobnl
-* __Samsung Galaxy S III (T-Mobile) (SGH-T999):__ cyanogen
-* __Samsung Galaxy S III (US Cellular) (SCH-R530):__ noobnl
-* __Samsung Galaxy S III (Verizon) (SCH-I535):__ invisiblek
* __Samsung Galaxy S IV (AT&T) (SGH-I337):__ attn1
* __Samsung Galaxy S IV (Canada) (SGH-I337M):__ DvTonder
* __Samsung Galaxy S IV LTE (GT-I9505):__ invisiblek, noobnl
diff --git a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml
new file mode 100644
index 0000000..1e4d855
--- /dev/null
+++ b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The CyanogenMod 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- The preferred APN to use, in the format name,mcc,mnc
+ Leave empty to choose automatically. -->
+ <string name="config_preferred_apn">fast.t-mobile.com,310,260</string>
+</resources>
+
diff --git a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml
new file mode 100644
index 0000000..9f82f18
--- /dev/null
+++ b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The CyanogenMod 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- The preferred APN to use, in the format name,mcc,mnc
+ Leave empty to choose automatically. -->
+ <string name="config_preferred_apn">pta,310,410</string>
+</resources>
+