commit 28a15a1fe09a74b32097833853dbeb3d77da18ac
author Vinit Deshpande <vinitd@google.com> Tue Sep 23 15:51:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 15:51:52 2014 +0000
tree cf708bee1d7f6f8e17b756aba2a88e4a3e0e3e06
parent 11ebb69d5050584b4adb504a034af93b68df06cf
parent 7fc42be1cd8e4dc47908079b507a714892e9073e

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

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;