Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6a3eddb4 to master

Browse Source 
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
This commit is contained in:
Dianne Hackborn
2010-09-30 20:34:34 -07:00
parent 557ed7aa29 6a3eddb469
commit dc71b9e4d6
15 changed files with 320 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/NetworkManagementService.java
View File

@@ -55,7 +55,7 @@ import java.util.concurrent.CountDownLatch;
class NetworkManagementService extends INetworkManagementService.Stub {
private static final String TAG = "NetworkManagmentService";
private static final boolean DBG = true;
private static final boolean DBG = false;
private static final String NETD_TAG = "NetdConnector";
class NetdResponseCode {