commit 5b0b44d08ff8caa2eae4185c9f16864a8d3d6368
author The Android Automerger <android-build@google.com> Sat Aug 22 01:01:46 2015 -0700
committer The Android Automerger <android-build@google.com> Sat Aug 22 01:01:46 2015 -0700
tree 65c4ccf44fe6dc6b3a52e29b0afba6526242c29d
parent 425cb0d3d67e331ceb3416f5251840489ea488fb
parent 8f2c1b0a3cf89fe035b23d7ceb3d6a38f6c7f0e2

merge in mnc-dr-release history after reset to mnc-dr-dev

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 323f542..96c01fc 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -8446,6 +8446,8 @@
       mnc="090"
       apn="isp"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MMS"
@@ -8456,6 +8458,8 @@
       mmsproxy="12.108.12.13"
       mmsport="3128"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Edge MMS Prepay"
@@ -8466,6 +8470,8 @@
       mmsproxy="12.108.12.13"
       mmsport="3128"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="PLATMMS"
@@ -8653,6 +8659,8 @@
       mmsproxy="proxy.aiowireless.net"
       mmsport="80"
       type="default,mms,fota,hipri,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="T-Mobile US 160"
@@ -8705,6 +8713,8 @@
       mnc="170"
       apn="isp.cingular"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Cingular MMS"
@@ -8717,6 +8727,8 @@
       mmsproxy="66.209.11.32"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="WCW-INTERNET"
@@ -9487,6 +9499,8 @@
       mmsc="http://mmsc.cingular.com/"
       mmsproxy="wireless.cingular.com"
       type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="AWS MMS"
@@ -9497,6 +9511,8 @@
       mmsproxy="10.250.250.55"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Celloneet MMS"
@@ -9519,6 +9535,8 @@
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ATT Phone"
@@ -9529,6 +9547,8 @@
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ATT WAP"
@@ -9541,6 +9561,8 @@
       mmsc="http://mmsc.cingular.com/"
       mmsproxy="wireless.cingular.com"
       type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Defense Mobile"
@@ -9922,6 +9944,8 @@
       mmsproxy="172.23.1.252"
       mmsport="8799"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Cellular One Smartphone"