summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorAndy Stadler <>2009-04-10 16:24:47 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-10 16:24:47 -0700
commitf8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 (patch)
tree1dd68eeddbfa83d571a3544d6d2e25ba9be21b49 /wifi/java/android/net
parent1eb75a0b3770177c3f0d0c2e843f80fc34451ef5 (diff)
downloadframeworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.zip
frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.gz
frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.bz2
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index d6277fa..3bee3b6 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -265,7 +265,6 @@ public class WifiConfiguration implements Parcelable {
wepKeys[i] = null;
}
- /** {@hide pending API Council approval} */
public String toString() {
StringBuffer sbuf = new StringBuffer();
if (this.status == WifiConfiguration.Status.CURRENT) {