resolved conflicts for merge of e2aa0490 to master

Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
2011-06-09 17:50:36 -07:00
parent aab49b40e8 e2aa04908c
commit f741e679c4
22 changed files with 406 additions and 138 deletions
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@ -84,7 +84,7 @@ import com.android.internal.R;

 public class WifiService extends IWifiManager.Stub {
    private static final String TAG = "WifiService";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;

    private final WifiStateMachine mWifiStateMachine;