resolved conflicts for merge of 34df5ccc to master

Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98
2010-08-20 06:18:50 -07:00
parent 0ca7aae911 34df5ccca4
commit 2338f48ddb
1 changed files with 1 additions and 1 deletions
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -245,4 +245,4 @@ public class WifiStateTracker implements NetworkStateTracker {
        }
    }

-}
+}