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

* commit '699ba17f310f88271335851eb0992f9b91579cd1':
  Fix documentation for Wifi ScanResult.timestamp