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

* commit 'ce15106585b4d347cedca0b9a8f4b06fc58fcb0b':