tree 309f4c8612e19ff3cf31f383296a58739ab1d9f9
parent 230d469ee9a3945dae77ab8233c2456ed764e6df
parent 607ac0bc7caaf02851f5ebb6b2a883491e2527e3
author Fred Chung <fchung@google.com> 1333568497 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333568497 -0700

am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1

* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
  Sample app for Android Training lesson: Making your app location aware.