tree 5ac136443ae2739da368981df5fcd29a5da4ac6f
parent 8659a2d190acd1226ca8076681831963b169c963
parent f336b9fce8b11c70b633bd71612544eaf2b9298b
author Fred Chung <fchung@google.com> 1333565268 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333565268 -0700

am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

* commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b':
  Updated sample app for Android Training class: Making Your App Location Aware.