resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp

Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
This commit is contained in:
Robert Greenwalt 2011-01-29 09:32:04 -08:00
commit 996d60e3a5

View file

@ -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. */