resolved conflicts for merge of 93aca85e to master am: 3f5a9b046d

Original change: undetermined

Change-Id: I8017e92f159dd82e59b0f0f5bcdc4ac7cda07638
This commit is contained in:
Dianne Hackborn
2021-05-31 10:49:19 +00:00
committed by Automerger Merge Worker

View File

@@ -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