am 59616aa6: am 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '59616aa6e652b8d54df93567101e3b455f2d94a8':
  Android Training: Making Your App Location Aware