tree 6062a97fa38485c1d855e368b0211bba59e6d229
parent ade335016e6864ddf203f4d1b31b895985da55e7
parent 04a73fb65c7fc6e8a02db98ea38ed722f60e9222
author Fred Chung <fchung@google.com> 1333484305 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333484305 -0700

am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware