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

* commit 'e359b3701bd144ea22ebc6551c8b35b7d99324db':