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

resolved conflicts for merge of f722cecd to honeycomb-plus-aosp

Browse Source 
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
This commit is contained in:
Scott Main
2011-02-16 12:08:36 -08:00
parent 271397cfb2 f722cecd18
commit 153cebee24
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
docs/html/index.jd
View File

@@ -129,16 +129,17 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'sdk': { 'sdk': {
'layout':"imgLeft", 'layout':"imgLeft",
'icon':"sdk-small.png", 'icon':"sdk-small.png",
'name':"Android 2.3.3", 'name':"Android 3.0",
'img':"gingerdroid.png", 'img':"honeycomb-android.png",
'title':"Android 2.3.3, more NFC!", 'title':"Android 3.0 is here!",
'desc': "<p>Android 2.3.3 is now available for the Android SDK. " 'desc': "<p>Android 3.0 is now available for the Android SDK. It offers a redesigned UI and "
+ "This update adds new NFC capabilities for developers, including advanced tag dispatching APIs " + "all new developer APIs for an optimized experience on tablets and similar devices. "
+ "and the ability to write to tags.</p>" + "For more information about what's in Android 3.0, read the "
+ "<p>The new APIs enable exciting new applications, such as for ticketing, " + "<a href='{@docRoot}sdk/android-3.0.html'>version notes</a>.</p>"
+ "ratings, check-ins, advertising, and data exchange with other devices. " + "<p>If you have an existing SDK, add Android 3.0 as an "
+ "For more information about Android 2.3.3, read the " + "<a href='{@docRoot}sdk/adding-components.html'>SDK "
+ "<a href='/sdk/android-2.3.3.html'>version notes</a>.</p>" + "component</a>. If you're new to Android, install the "
+ "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>."
}, },
'tv': { 'tv': {