| Chunk |
|---|
| Conflicting content |
|---|
/** {@hide} */
public static final int TYPE_DUMMY = 8;
<<<<<<< HEAD
/** {@hide} */
=======
/**
* The Default Ethernet data connection. When active, all data traffic
* will use this connection by default.
*/
>>>>>>> 8de47a2f25a9379c44f220f0bd0f25585bfbc9fb
public static final int TYPE_ETHERNET = 9;
/**
* Over the air Adminstration. |
| Solution content |
|---|
/** {@hide} */
public static final int TYPE_DUMMY = 8;
/**
* The Default Ethernet data connection. When active, all data traffic
* will use this connection by default.
*/
public static final int TYPE_ETHERNET = 9;
/**
* Over the air Adminstration. |
| File |
|---|
| ConnectivityManager.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |