commit fb772973735e0f41a4abce374edd33aaae6bbe31
author gitbuildkicker <android-build@google.com> Thu Mar 23 00:06:53 2017 -0700
committer gitbuildkicker <android-build@google.com> Thu Mar 23 00:06:53 2017 -0700
tree c9b8badca37e4b29966addc5b09d298737391b1e
parent 7f9deae0bd8395f7f77f3be0b5d249ef9614ff23
parent bf7a3d578617821673540203f3bf5db25b5b3e76

merge in oc-release history after reset to master

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index b18a637..883f2b6 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -8361,7 +8361,7 @@
       mnc="004"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -8372,7 +8372,7 @@
       mnc="004"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
+      type="default,mms,supl,fota,cbs,dun"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -13807,7 +13807,7 @@
       mnc="480"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -13819,7 +13819,7 @@
       mnc="480"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
+      type="default,mms,supl,fota,cbs,dun"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"