tree 3cb9d488614b2621a4ddc2678ed4f156ebdec600
parent 68b225a5c05e29457f12fe668b01489b5b7ca85e
parent c793583628c16215891bb137de96dc0500f12c6a
author Fred Chung <fchung@google.com> 1333568796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333568796 -0700

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

* commit 'c793583628c16215891bb137de96dc0500f12c6a':