tree cbf2ba5c17cdd43fb63a958bad3b31d557da9550
parent 28a068e0bd06c9baff580f28b60dfafeb80d3c47
parent de07d41f6396f9f040fed2b6780932d8e5dbb482
author Victoria Lease <violets@google.com> 1359393078 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359393078 -0800

am de07d41f: Merge "Annotate Locations coming from mock providers"

# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'de07d41f6396f9f040fed2b6780932d8e5dbb482':
  Annotate Locations coming from mock providers