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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base