tree b0748deb721e4f4b232106228d58cbe4242956f9
parent a03b844eda303f6195f23c0ddc73659f02e8f46c
parent 5659e5795622f2d07f2871408b02839f5807072b
author Irfan Sheriff <isheriff@google.com> 1344893588 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344893588 -0700

am 5659e579: Merge "CTS for timestamp in ScanResult" into jb-mr1-dev

* commit '5659e5795622f2d07f2871408b02839f5807072b':
  CTS for timestamp in ScanResult