From de784d913123376a886b5e8c4e619b7f87484c5f Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Thu, 29 Sep 2011 15:23:05 -0700
Subject: [PATCH] Cherrypick 3bfbbe2 from master. do not merge.

Update version of apn configuration files to version 7

Bug: 5339656
Change-Id: I874be2efaead642ce24abab8824bf8a916a81271
---
 data/etc/apns-conf.xml     | 2 +-
 data/etc/apns-conf_sdk.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/etc/apns-conf.xml b/data/etc/apns-conf.xml
index 156fec276..2fe90d96e 100644
--- a/data/etc/apns-conf.xml
+++ b/data/etc/apns-conf.xml
@@ -19,7 +19,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
+<apns version="7">
     <apn carrier="T-Mobile US"
          mcc="310"
          mnc="260"
diff --git a/data/etc/apns-conf_sdk.xml b/data/etc/apns-conf_sdk.xml
index 5129dc716..0e9cf7d8f 100644
--- a/data/etc/apns-conf_sdk.xml
+++ b/data/etc/apns-conf_sdk.xml
@@ -23,7 +23,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
+<apns version="7">
     <apn carrier="Android"
         mcc="310"
         mnc="995"