Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp * commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599': Don't throw an exception from isProviderEnabled and getLastKnownLocation
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp * commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599': Don't throw an exception from isProviderEnabled and getLastKnownLocation