summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2010-05-19 12:11:03 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-19 12:11:03 -0700
commitf5172c555f67a2a521be9d458c3afc69d9dfe18b (patch)
tree7b444374b5f46e0da6535a6dc473f95ce6a0edad
parentb32a74c73b1433a3613419e61c05f6ff8efb5b41 (diff)
parent8bf77456cec82cbda3393a4e48f265af1670e795 (diff)
am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken * commit '8bf77456cec82cbda3393a4e48f265af1670e795': docs: revise platform intro
-rw-r--r--docs/html/sdk/android-2.2.jd5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/html/sdk/android-2.2.jd b/docs/html/sdk/android-2.2.jd
index 7e625166533f..ab261f0cb7be 100644
--- a/docs/html/sdk/android-2.2.jd
+++ b/docs/html/sdk/android-2.2.jd
@@ -38,9 +38,8 @@ differences report &raquo;</a> </li>
<p>
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
-<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
-deployable to Android-powered handsets starting in {@sdkPlatformDeployableDate}.
-This release includes user features, developer features, API changes, and bug
+<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release including user
+features, developer features, API changes, and bug
fixes. For information on developer features and API changes, see the
<a href="#api">Framework API</a> section.</p>