summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 14:50:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 14:50:32 -0700
commit4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f (patch)
tree7083e7e246a84ce95587d5c7107cd805c5a6fbb8
parentf57266175dffe68c5709f432dd6983c314d164f4 (diff)
parent322ba0d403ca063c1374d48c5a6717a585052abf (diff)
downloadframeworks_base-4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f.zip
frameworks_base-4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f.tar.gz
frameworks_base-4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f.tar.bz2
am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '322ba0d403ca063c1374d48c5a6717a585052abf': 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 3217196..c4e8829 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>