resolved conflicts for merge of 93aca85e to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
This commit is contained in:
commit
3f5a9b046d
1 changed files with 1 additions and 1 deletions
|
|
@ -68,7 +68,7 @@ import java.net.UnknownHostException;
|
|||
*/
|
||||
public class ConnectivityService extends IConnectivityManager.Stub {
|
||||
|
||||
private static final boolean DBG = true;
|
||||
private static final boolean DBG = false;
|
||||
private static final String TAG = "ConnectivityService";
|
||||
|
||||
// how long to wait before switching back to a radio's default network
|
||||
|
|
|
|||
Loading…
Reference in a new issue