commit 0af345c3b8cf1526ad238fab9d5ce90e3f058e58
author Scott Main Wed Apr 22 00:55:10 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Apr 22 00:55:10 2009 -0700
tree c3443b8704d4b2569b3844b4b79b0b71a4195e05
parent d108c3003b7e205ea24c1ddadd20c71bd222673c

AI 147318: am: CL 147317 am: CL 147314 change carousel SDK to 1.5;
  revise Google IO info
  Original author: smain
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147318

docs/html/index.jd

diff --git a/docs/html/index.jd b/docs/html/index.jd
index bd681e2..aea2299 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -12,7 +12,7 @@
                         <!-- total max width is 520px -->
                             <img src="{@docRoot}assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
                             <div id="announcement" style="width:270px">
-                              <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco.</p>
+                              <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.</p>
                               <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
                             </div> <!-- end annoucement -->
                         </div> <!-- end annoucement-block -->
@@ -116,10 +116,10 @@
     'sdk': {
       'layout':"imgLeft",
       'icon':"sdk-small.png",
-      'name':"SDK 1.1 r1",
+      'name':"SDK 1.5 r1",
       'img':"sdk-large.png",
-      'title':"Android 1.1 SDK r1",
-      'desc': "<p>A new Android SDK is available for download. The new SDK includes minor API changes, new UI localizations, bug fixes and some new application features.</p><p><a href='{@docRoot}sdk/1.1_r1/index.html'>Download Android 1.1 SDK r1</a></p>"
+      'title':"Android 1.5 SDK r1",
+      'desc': "<p>The final version of the Android 1.5 SDK is now available. It includes new APIs for Android 1.5, updated developer tools, multiple platform versions, and a Google APIs Add-on.</p><p><a href='{@docRoot}sdk/1.5_r1/index.html'>Download Android 1.5 SDK</a></p>"
     },
 
     'mapskey': {