merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
index 52560b6..95b6e0e 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">2592</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
index 61ee738..7f141e3 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">1296</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
index d45d7fb..1abe473 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">2592</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
index 75e378e..5bd2547 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">2592</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
index a884d3f..c0103c5 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
@@ -32,7 +32,7 @@
     <int name="maxImageWidth">1296</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
index 5d96915..28867a9 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">1296</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
index 9a6fe92..46c4267 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">2592</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
index 3cb5424..cd89021 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">1296</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
index 55e9bb7..6410e89 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
@@ -27,7 +27,7 @@
     <int name="maxImageWidth">1296</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
     <!-- UAProf URL -->
     <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
diff --git a/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/packages/apps/Mms/res/xml/mms_config.xml
index 0335c1a..21c9c54 100644
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml/mms_config.xml
@@ -67,6 +67,6 @@
     <int name="maxMessageTextSize">-1</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Nexus</string>
+    <string name="userAgent">Nexus4</string>
 
 </mms_config>