summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <>2009-04-22 13:27:42 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-22 13:27:42 -0700
commit9077708767041c6f5d692bbc867c27648f297b3d (patch)
tree6f51872a6f1270bce6a3269b74a1de952860af62 /docs/html
parent3aa6511539808303946698eb000b5bdfcca6111f (diff)
downloadframeworks_base-9077708767041c6f5d692bbc867c27648f297b3d.zip
frameworks_base-9077708767041c6f5d692bbc867c27648f297b3d.tar.gz
frameworks_base-9077708767041c6f5d692bbc867c27648f297b3d.tar.bz2
AI 147317: am: CL 147314 change carousel SDK to 1.5;
revise Google IO info Original author: smain Merged from: //branches/cupcake/... Automated import of CL 147317
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/index.jd8
1 files changed, 4 insertions, 4 deletions
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 @@ home=true
<!-- 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 @@ home=true
'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': {