am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and...
am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '9714d2c4' into gingerbread-plus-aosp
* commit '9714d2c4':
Don't throw an exception from isProviderEnabled and getLastKnownLocation