summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-18 13:48:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-18 13:48:38 -0700
commit34df5ccca4c31d131eccc96c2ebf5cc698edfe21 (patch)
treea5d24349f054ea9ebf534f64732cd402737d6a17 /wifi
parent33992d4195fe55f42ba6919f5a07707a51a12d5d (diff)
parenta00f8db5ef724bf9a695ac43c1538557f2dffe1f (diff)
downloadframeworks_base-34df5ccca4c31d131eccc96c2ebf5cc698edfe21.zip
frameworks_base-34df5ccca4c31d131eccc96c2ebf5cc698edfe21.tar.gz
frameworks_base-34df5ccca4c31d131eccc96c2ebf5cc698edfe21.tar.bz2
Merge "fix build" into gingerbread-plus-aosp
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiStateTracker.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index fe1b096..cdf154f 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -319,8 +319,6 @@ public class WifiStateTracker extends NetworkStateTracker {
private static String[] sDnsPropNames;
private Runnable mReleaseWakeLockCallback;
- private static String[] sDnsPropNames;
-
/**
* A structure for supplying information about a supplicant state
* change in the STATE_CHANGE event message that comes from the