summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-05-12 11:10:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 11:10:10 -0700
commite46defea3ae15787aa6afbb91cb9dc83d4a074e4 (patch)
tree15ab86dcd8f11585a7c122c4c13d969b80dc6a4c
parentafbc5fad91a5da627b908526b9604833d8d37bcb (diff)
parent68b37d14708414d3cee418024c178f0a3c7d8b5b (diff)
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken * commit '68b37d14708414d3cee418024c178f0a3c7d8b5b': Doc change: remove Google I/O 09 from carousel.
-rw-r--r--docs/html/index.jd9
1 files changed, 0 insertions, 9 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index bb76d28b8f1f..230dd4efa510 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -177,15 +177,6 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'img':"maps-large.png",
'title':"Maps API Key",
'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='http://code.google.com/android/add-ons/google-apis/maps-overview.html'>Learn more &raquo;</a></p>"
- },
-
- 'io': {
- 'layout':"imgLeft",
- 'icon':"io-small.png",
- 'name':"Google I/O '09'",
- 'img':"io-large.png",
- 'title':"2009 Google I/O Developer Conference",
- 'desc': "<p>The 2009 Google I/O developer conference took place May 27-28, 2009, in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"
}
}