Jake Hamby afd28ac6ec am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp ...

* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
  Enable support for SMS national language shift tables.

2011-05-11 13:09:42 -07:00

..

ComprehensiveCountryDetector.java

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00

CountryDetectorBase.java

…

GeocoderProxy.java

Remove races in Geocoder/LocationProvider Proxy

2010-10-05 11:12:48 -07:00

GpsLocationProvider.java

Enable support for SMS national language shift tables.

2011-04-06 14:20:04 -07:00

GpsXtraDownloader.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

LocationBasedCountryDetector.java

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00

LocationProviderInterface.java

…

LocationProviderProxy.java

Remove races in Geocoder/LocationProvider Proxy

2010-10-05 11:12:48 -07:00

MockProvider.java

…

PassiveProvider.java

…