tree 897ac1f6731437aaa202e28bc7d30f138edb0675
parent bc2f7146e60c7fcc89ca8ac61eb370ca8da2b0e7
parent f12fc2e14ebcf14745de03963a621e36bda11232
author vandwalle <vandwalle@google.com> 1417032404 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417032404 +0000

am f12fc2e1: am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev

* commit 'f12fc2e14ebcf14745de03963a621e36bda11232':
  make startScan with worksource specific to location scans