Remove the temporary UA and UAProf for USC
Bug:18071596
Change-Id: I23842e71647120820bcc9cdaba24bc2156d7633c
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
index ce6b947..a4822aa 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
@@ -20,12 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">moto-xt1103/Android</string>
-
- <!-- MMS user agent prolfile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motoxt1103/Profile/motoxt1103.rdf</string>
-
<!-- Values for GPS configuration (US Cellular) -->
<string-array translatable="false" name="config_gpsParameters">
<item>SUPL_HOST=supl.google.com</item>
