summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-05-12 11:14:27 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 11:14:27 -0700
commit7ae12ef4d60ef5e469851b39b74c4bc98211a7f7 (patch)
treed88887e7a7d6eb748cec0dfce85d7cdc9027e45c
parent691d03e73d59d47bbb8273176e0971896f9759b6 (diff)
parentf41bc1200354b20aef91e5266035cf91069d69a5 (diff)
am f41bc120: am e46defea: am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
-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>"
}
}