From 1f362e54ae16cdc3962344384982874bf9c80878 Mon Sep 17 00:00:00 2001
From: Youhan Wang <youhanw@google.com>
Date: Tue, 30 Aug 2016 13:05:36 -0700
Subject: [PATCH] Combine two separate for O2UK apn.

Bug:31003769
Change-Id: Iae673d4054b854b8d35e32fa3d7cef9c58dad4ed
---
 apns-full-conf.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index d49e6a4c..b2543eee 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -3407,20 +3407,11 @@
       apn="mobile.o2.co.uk"
       user="o2web"
       password="password"
-      type="default,supl"
-  />
-
-  <apn carrier="O2 MMS"
-      mcc="234"
-      mnc="10"
-      apn="wap.o2.co.uk"
-      user="o2wap"
-      password="password"
       authtype="1"
       mmsc="http://mmsc.mms.o2.co.uk:8002"
       mmsproxy="82.132.254.1"
       mmsport="8080"
-      type="mms"
+      type="default, hipri, supl, mms"
   />
 
   <apn carrier="O2 Pay &amp; Go"