Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1