merge from open-source master

Change-Id: If6730b50627b2231bd345e594d8d30a37557849e

diff --cc api/current.xml
index 4ec3355,d02c826..e27fb5c
--- 1/api/current.xml
--- 2/api/current.xml
+++ b/api/current.xml
@@@ -142238,7 -135746,18 +142238,18 @@@
   visibility="public"
  >
  </field>
 -<field name="TYPE_TEXT_FLAG_CAP_WORDS"
++<field name="NETWORK_TYPE_EVDO_B"
+  type="int"
+  transient="false"
+  volatile="false"
 - value="8192"
++ value="12"
+  static="true"
+  final="true"
+  deprecated="not deprecated"
+  visibility="public"
+ >
+ </field>
 -<field name="TYPE_TEXT_FLAG_IME_MULTI_LINE"
 +<field name="NETWORK_TYPE_GPRS"
   type="int"
   transient="false"
   volatile="false"

diff --cc core/java/android/net/MobileDataStateTracker.java
Simple merge

diff --cc services/java/com/android/server/status/StatusBarPolicy.java
Simple merge

diff --cc telephony/java/android/telephony/ServiceState.java
Simple merge

diff --cc telephony/java/android/telephony/TelephonyManager.java
index f018d10,310fc7f..ab63017
--- 1/telephony/java/android/telephony/TelephonyManager.java
--- 2/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@@ -389,8 -386,9 +389,11 @@@ public class TelephonyManager 
      public static final int NETWORK_TYPE_HSUPA = 9;
      /** Current network is HSPA */
      public static final int NETWORK_TYPE_HSPA = 10;
 +    /** Current network is iDen */
 +    public static final int NETWORK_TYPE_IDEN = 11;
+     /** Current network is EVDO revision B*/
+     public static final int NETWORK_TYPE_EVDO_B = 12;
+ 
  
      /**
       * Returns a constant indicating the radio technology (network type)

diff --cc telephony/java/com/android/internal/telephony/ServiceStateTracker.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
Simple merge