summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2014-09-23 15:51:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-23 15:51:52 +0000
commit28a15a1fe09a74b32097833853dbeb3d77da18ac (patch)
treecf708bee1d7f6f8e17b756aba2a88e4a3e0e3e06 /wifi
parent11ebb69d5050584b4adb504a034af93b68df06cf (diff)
parent7fc42be1cd8e4dc47908079b507a714892e9073e (diff)
downloadframeworks_base-28a15a1fe09a74b32097833853dbeb3d77da18ac.zip
frameworks_base-28a15a1fe09a74b32097833853dbeb3d77da18ac.tar.gz
frameworks_base-28a15a1fe09a74b32097833853dbeb3d77da18ac.tar.bz2
am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev
* commit '6839bf68d8f557e7d31410a3f88f2e32a4f1a2b8': Fix documentation for Wifi ScanResult.timestamp
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/ScanResult.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index e80a8f4..27c2541 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -59,7 +59,7 @@ public class ScanResult implements Parcelable {
public int frequency;
/**
- * Time Synchronization Function (tsf) timestamp in microseconds when
+ * timestamp in microseconds (since boot) when
* this result was last seen.
*/
public long timestamp;