Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'readonly-p4-donut' into donut

Browse Source
This commit is contained in:
Scott Main
2009-04-22 13:28:57 -07:00
committed by The Android Open Source Project
parent 003f213bdf 9077708767
commit 680974e363
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/html/index.jd
View File

@@ -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': {