diff options
author | Vinit Deshpande <vinitd@google.com> | 2014-09-23 16:22:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 16:22:06 +0000 |
commit | 2e88cecdb5641c75bd8ae03172157fc8a901b3e5 (patch) | |
tree | 057332bef5f3cc25cc4d3829ef2f3f9a05b9b8dc /wifi | |
parent | 3cf006a0ce8357b580bc2ec2f82998045700dd4e (diff) | |
parent | 28a15a1fe09a74b32097833853dbeb3d77da18ac (diff) | |
download | frameworks_base-2e88cecdb5641c75bd8ae03172157fc8a901b3e5.zip frameworks_base-2e88cecdb5641c75bd8ae03172157fc8a901b3e5.tar.gz frameworks_base-2e88cecdb5641c75bd8ae03172157fc8a901b3e5.tar.bz2 |
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
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/ScanResult.java | 2 |
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 052f74e..061d99a 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -61,7 +61,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; |