resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963

core/java/android/net/ConnectivityManager.java

@@ -221,6 +221,8 @@ public class ConnectivityManager
 
     /** {@hide} */
     public static final int TYPE_DUMMY       = 8;
+    /** {@hide} */
+    public static final int TYPE_ETHERNET    = 9;
     /** {@hide} TODO: Need to adjust this for WiMAX. */
     public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;
     /** {@hide} TODO: Need to adjust this for WiMAX. */

telephony/java/android/telephony/TelephonyManager.java

@@ -402,7 +402,6 @@ public class TelephonyManager {
     /** Current network is eHRPD */
     public static final int NETWORK_TYPE_EHRPD = 14;
 
-
     /**
      * Returns a constant indicating the radio technology (network type)
      * currently in use on the device for data transmission.