Dianne Hackborn e746f03c6c resolved conflicts for merge of 53686433 to master ...

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d

2010-09-13 16:56:10 -07:00

..

ComprehensiveCountryDetector.java

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

CountryDetectorBase.java

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

GeocoderProxy.java

…

GpsLocationProvider.java

Track client requests through location manager.

2010-09-13 14:20:48 -07:00

GpsXtraDownloader.java

…

LocationBasedCountryDetector.java

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

LocationProviderInterface.java

Track client requests through location manager.

2010-09-13 14:20:48 -07:00

LocationProviderProxy.java

Track client requests through location manager.

2010-09-13 14:20:48 -07:00

MockProvider.java

Track client requests through location manager.

2010-09-13 14:20:48 -07:00

PassiveProvider.java

Track client requests through location manager.

2010-09-13 14:20:48 -07:00