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

* commit '0249e6c4f9083206c1ab280dfa149a65bf931b7e':