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

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