summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kmccormick <kmccormick@google.com> 2013-04-03 14:54:32 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-04-03 14:54:32 -0700
commit9da4bde42329fe6c03d2eb4617f91892002e4460 (patch)
tree8af3d666a7706213bd4a66e38635142738833a02
parent9d9365916def1a60d98cab7d59a4c98d9e7f6f42 (diff)
parent4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f (diff)
am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f': Doc update: add links to maps docs
-rw-r--r--docs/html/guide/topics/location/index.jd6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/html/guide/topics/location/index.jd b/docs/html/guide/topics/location/index.jd
index 321719667605..c4e88292b97c 100644
--- a/docs/html/guide/topics/location/index.jd
+++ b/docs/html/guide/topics/location/index.jd
@@ -59,7 +59,9 @@ href="{@docRoot}guide/topics/location/strategies.html">Location Strategies</a> g
<h2 id="maps">Google Maps Android API</h2>
-<p>With the Google Maps Android API, you can add maps to your app that are based on Google
+<p>With the
+<a href="http://developers.google.com/maps/documentation/android/">Google Maps Android API</a>,
+you can add maps to your app that are based on Google
Maps data. The API automatically handles access to Google Maps servers, data downloading,
map display, and touch gestures on the map. You can also use API calls to add markers,
polygons and overlays, and to change the user's view of a particular map area.</p>
@@ -85,6 +87,6 @@ with the Google Play Store running Android 2.2 or higher, through
<p>To integrate Google Maps into your app, you need to install the Google Play services
libraries for your Android SDK. For more details, read about <a
-href="{@docRoot}google/play-services/index.html">Google Play services</a>.</p>
+href="{@docRoot}google/play-services/maps.html">Google Play services</a>.</p>