diff options
| author | Scott Main <smain@google.com> | 2011-02-16 12:08:36 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2011-02-16 12:08:36 -0800 |
| commit | 153cebee2432a931773130bffa20e72a982c0107 (patch) | |
| tree | d7cbc6889af07bf34cd74122f9fb77a584212e4d /docs | |
| parent | 271397cfb2b79d1346568209b37b1f57707f924a (diff) | |
| parent | f722cecd182b909eae3dc6ec7f41900b53ba45c1 (diff) | |
| download | frameworks_base-153cebee2432a931773130bffa20e72a982c0107.zip frameworks_base-153cebee2432a931773130bffa20e72a982c0107.tar.gz frameworks_base-153cebee2432a931773130bffa20e72a982c0107.tar.bz2 | |
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/index.jd | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 0c57527..2248752 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -129,16 +129,17 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ 'sdk': { 'layout':"imgLeft", 'icon':"sdk-small.png", - 'name':"Android 2.3.3", - 'img':"gingerdroid.png", - 'title':"Android 2.3.3, more NFC!", - 'desc': "<p>Android 2.3.3 is now available for the Android SDK. " -+ "This update adds new NFC capabilities for developers, including advanced tag dispatching APIs " -+ "and the ability to write to tags.</p>" -+ "<p>The new APIs enable exciting new applications, such as for ticketing, " -+ "ratings, check-ins, advertising, and data exchange with other devices. " -+ "For more information about Android 2.3.3, read the " -+ "<a href='/sdk/android-2.3.3.html'>version notes</a>.</p>" + 'name':"Android 3.0", + 'img':"honeycomb-android.png", + 'title':"Android 3.0 is here!", + 'desc': "<p>Android 3.0 is now available for the Android SDK. It offers a redesigned UI and " ++ "all new developer APIs for an optimized experience on tablets and similar devices. " ++ "For more information about what's in Android 3.0, read the " ++ "<a href='{@docRoot}sdk/android-3.0.html'>version notes</a>.</p>" ++ "<p>If you have an existing SDK, add Android 3.0 as an " ++ "<a href='{@docRoot}sdk/adding-components.html'>SDK " ++ "component</a>. If you're new to Android, install the " ++ "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>." }, 'tv': { |