commit 01548ba25404744c8248cb5f3cd05bdd56cd4613
author Robert Greenwalt <rgreenwalt@google.com> Fri Dec 07 12:18:44 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 07 12:18:44 2012 -0800
tree 6a6f010655afedb3b634e1a4a9d97d72dc390a55
parent 9c0533a8df85bcd1aacc733512f7d3b032e83231
parent bc92a28eb36b09326c0502bf2bc1665604183698

am bc92a28e: resolved conflicts for merge of d71914ed to jb-mr1-dev-plus-aosp

* commit 'bc92a28eb36b09326c0502bf2bc1665604183698':
  Add new APN values for a new operator (Hot Mobile) in Israel. Signed-off-by: tal <talkarliner7@gmail.com>

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index a7e608d..fa5c719 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -11939,14 +11939,14 @@
       type="mms"
   />
 
-  <apn carrier="Internet HOT mobile"
+  <apn carrier="Net HOT mobile"
       mcc="425"
       mnc="07"
       apn="net.hotm"
       type="default,supl"
   />
 
-  <apn carrier="MMS HOT mobile"
+  <apn carrier="Mms HOT mobile"
       mcc="425"
       mnc="07"
       apn="mms.hotm"
@@ -12005,21 +12005,6 @@
       type="mms"
   />
 
-  <apn carrier="YouPhone 3G"
-      mcc="425"
-      mnc="14"
-      apn="data.youphone.co.il"
-      type="default,supl"
-  />
-
-  <apn carrier="YouPhone MMS"
-      mcc="425"
-      mnc="14"
-      apn="data.youphone.co.il"
-      mmsc="http://192.168.220.15/servlets/mms"
-      type="mms"
-  />
-
   <apn carrier="Batelco Internet"
       mcc="426"
       mnc="01"