Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp * commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c': Handle the case where GoogleLocationSettingObserver::onChange
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp * commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c': Handle the case where GoogleLocationSettingObserver::onChange