tree 1b04b1366e1e454c0a74ddd1f96659e03c656ad3
parent e99be2ead89d59312eae545f4606592fd722768d
parent 6782aaa01b44609415a694e36886f416c9e36646
author Vinit Deshpande <vinitd@google.com> 1411441619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411441619 +0000

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

* commit 'b74eaee83f6ae364648d88989b83a28647bd1df0':
  Fix documentation for Wifi ScanResult.timestamp