diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 06:18:50 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 06:18:50 -0700 |
| commit | 2338f48ddb3d1746c2d46df85fdc4dcd6cfa240b (patch) | |
| tree | e046cdbfa5bcb565b3ff3327a4b99250bedb85cb /wifi | |
| parent | 0ca7aae911be0a9585cafce6eb614b3d69607e10 (diff) | |
| parent | 34df5ccca4c31d131eccc96c2ebf5cc698edfe21 (diff) | |
| download | frameworks_base-2338f48ddb3d1746c2d46df85fdc4dcd6cfa240b.zip frameworks_base-2338f48ddb3d1746c2d46df85fdc4dcd6cfa240b.tar.gz frameworks_base-2338f48ddb3d1746c2d46df85fdc4dcd6cfa240b.tar.bz2 | |
resolved conflicts for merge of 34df5ccc to master
Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index a5f62c1..147e2dc 100644 --- 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 { } } -}
\ No newline at end of file +} |