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

* commit 'c793583628c16215891bb137de96dc0500f12c6a':