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.