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

* commit '274fb3c68077fcf710f8f9c165681265af4ffcd7':
  Android Training: Making Your App Location Aware