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

* commit '4f5f461b159b993455976a623617dffdd5e20c2a':
  Sample app for Android Training lesson: Making your app location aware.