commit 2e88cecdb5641c75bd8ae03172157fc8a901b3e5
author Vinit Deshpande <vinitd@google.com> Tue Sep 23 16:22:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 16:22:06 2014 +0000
tree 057332bef5f3cc25cc4d3829ef2f3f9a05b9b8dc
parent 3cf006a0ce8357b580bc2ec2f82998045700dd4e
parent 28a15a1fe09a74b32097833853dbeb3d77da18ac

am ccafcfbc: am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev

* commit 'ccafcfbc63a0f7e279112b8ce717f7408ac3774d':
  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 052f74e..061d99a 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -61,7 +61,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;