merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index f7a7bc0..20c1883 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -3409,7 +3409,7 @@
password="password"
authtype="1"
mmsc="http://mmsc.mms.o2.co.uk:8002"
- type="default,hipri,supl,mms"
+ type="default, hipri, supl, mms"
/>
<apn carrier="O2 Pay & Go"
@@ -26805,7 +26805,7 @@
mmsproxy="10.0.0.172"
mmsport="80"
mmsc="http://mmsc.myuni.com.cn"
- type="default,mms"/>
+ type="default, mms"/>
<apn carrier="ctlte"
mcc="460"