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

* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware