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

* commit '33c99ba6978126d6ec57c83a91772f5a531851ec':