Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair * commit '7566c1debebe072af76411e11d96810fd1409482': LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair * commit '7566c1debebe072af76411e11d96810fd1409482': LocationManager: Fix problem replacing GPS and network providers with a mock provider.