summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-04-22 12:09:59 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-04-22 12:09:59 -0700
commitcddff7c3ce9ea4828f108a879b8d3a2d77076df9 (patch)
tree09bb3f17015c108005decbf1fbd6cebee956d3cc /location
parent9f0b1a48506af8e18162f62570561135b65a4ed1 (diff)
parent4193558f232c8961039b9ae6f875e3303b8e5d30 (diff)
downloadframeworks_base-cddff7c3ce9ea4828f108a879b8d3a2d77076df9.zip
frameworks_base-cddff7c3ce9ea4828f108a879b8d3a2d77076df9.tar.gz
frameworks_base-cddff7c3ce9ea4828f108a879b8d3a2d77076df9.tar.bz2
Merge commit 'goog/readonly-p4-donut' into HEAD
Conflicts: location/java/android/location/Geocoder.java
Diffstat (limited to 'location')
-rw-r--r--location/java/android/location/Geocoder.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/location/java/android/location/Geocoder.java b/location/java/android/location/Geocoder.java
index 2ce1273..53e46b7 100644
--- a/location/java/android/location/Geocoder.java
+++ b/location/java/android/location/Geocoder.java
@@ -36,11 +36,11 @@ import java.util.List;
* coordinate into a (partial) address. The amount of detail in a
* reverse geocoded location description may vary, for example one
* might contain the full street address of the closest building, while
- * another might contain only a city name and postal code.
+ * another might contain only a city name and postal code.
*
* The Geocoder class requires a backend service that is not included in
- * the core android framework. The Geocoder query methods will return an
- * empty list if there no backend service in the platform.
+ * the core android framework. The Geocoder query methods will return an
+ * empty list if there no backend service in the platform.
*/
public final class Geocoder {
private static final String TAG = "Geocoder";