commit 6a781b8b8ffe074c006ffff1a7e980e2b7570461
author Vinit Deshpande <vinitd@google.com> Tue Sep 23 03:06:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 03:06:59 2014 +0000
tree 1b04b1366e1e454c0a74ddd1f96659e03c656ad3
parent e99be2ead89d59312eae545f4606592fd722768d
parent 6782aaa01b44609415a694e36886f416c9e36646

am b74eaee8: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev

* commit 'b74eaee83f6ae364648d88989b83a28647bd1df0':
  Fix documentation for Wifi ScanResult.timestamp

wifi/java/android/net/wifi/ScanResult.java

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 int frequency;
 
     /**
-     * Time Synchronization Function (tsf) timestamp in microseconds when
+     * timestamp in microseconds (since boot) when
      * this result was last seen.
      */
     public long timestamp;