summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorvandwalle <vandwalle@google.com>2014-10-04 16:06:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-04 16:06:17 +0000
commit3041a9e07dc85151a96062f67abf2eb1b5ef25bb (patch)
treefeb5a5b415d7422e73c22a654483929f945a7339 /wifi
parent52afdb14df61232871d71432da437c0e5d83cbc8 (diff)
parent542cc240b5bd68a728067f65cd8bc4d8f6473b83 (diff)
downloadframeworks_base-3041a9e07dc85151a96062f67abf2eb1b5ef25bb.zip
frameworks_base-3041a9e07dc85151a96062f67abf2eb1b5ef25bb.tar.gz
frameworks_base-3041a9e07dc85151a96062f67abf2eb1b5ef25bb.tar.bz2
am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
* commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83': add millisecond timestamp to locallog
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 1be6fdf..7f8397b 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1133,7 +1133,7 @@ public class WifiConfiguration implements Parcelable {
sbuf.append(",ipfail=");
sbuf.append(result.numIpConfigFailures);
}
- sbuf.append(result.autoJoinStatus).append("} ");
+ sbuf.append(",").append(result.autoJoinStatus).append("} ");
}
sbuf.append('\n');
}