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

* commit '42f0a7ed931a977da46f71d26dc5f57835a7bdd5':