tree cf708bee1d7f6f8e17b756aba2a88e4a3e0e3e06
parent 11ebb69d5050584b4adb504a034af93b68df06cf
parent 7fc42be1cd8e4dc47908079b507a714892e9073e
author Vinit Deshpande <vinitd@google.com> 1411487512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411487512 +0000

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