am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

* commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b':
  Updated sample app for Android Training class: Making Your App Location Aware.