Merge commit '49c22570bb8717bb678dbd8bae6692bb585370fc' into eclair-plus-aosp * commit '49c22570bb8717bb678dbd8bae6692bb585370fc': LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '49c22570bb8717bb678dbd8bae6692bb585370fc' into eclair-plus-aosp * commit '49c22570bb8717bb678dbd8bae6692bb585370fc': LocationManager: Fix problem replacing GPS and network providers with a mock provider.