commit 77913777dd8aa4866dd237fc08e07d66a0262643
author The Android Automerger <android-build@google.com> Tue May 17 00:02:31 2016 -0700
committer The Android Automerger <android-build@google.com> Tue May 17 00:02:31 2016 -0700
tree 30652608a77447eaf6ea098c8de33d4cd5882107
parent 64e978f0071b0e5bf6cfd08e64b6be77ab0b93ea
parent a435a538f1019eda1fb101e831b9672833f13780

merge in nyc-release history after reset to nyc-dev

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index e617a98..91b4971 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -9228,6 +9228,39 @@
       type="mms"
       protocol="IPV6"
       roaming_protocol="IP"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17"
+  />
+
+  <apn carrier="T-Mobile MMS"
+       mcc="310"
+       mnc="260"
+       apn="TMUS"
+       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+       type="mms"
+       protocol="IPV6"
+       roaming_protocol="IPV6"
+       bearer_bitmask="18"
+  />
+
+  <apn carrier="T-Mobile IMS"
+       mcc="310"
+       mnc="260"
+       apn="ims"
+       type="ims"
+       modem_cognitive="true"
+       protocol="IPV6"
+       bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17"
+  />
+
+  <apn carrier="T-Mobile IMS"
+       mcc="310"
+       mnc="260"
+       apn="ims"
+       type="ims"
+       modem_cognitive="true"
+       protocol="IPV6"
+       roaming_protocol="IPV6"
+       bearer_bitmask="18"
   />
 
   <apn carrier="Project Fi - T"
@@ -9244,15 +9277,6 @@
        mvno_type="IMSI"
   />
 
-  <apn carrier="T-Mobile IMS"
-      mcc="310"
-      mnc="260"
-      apn="ims"
-      type="ims"
-      modem_cognitive="true"
-      protocol="IPV6"
-  />
-
   <apn carrier="MetroPCS 260"
       mcc="310"
       mnc="260"