summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-05-19 12:05:52 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-19 12:05:52 -0700
commit8d0e37f5b142623b41b78ce5d19b4b650d53eb7f (patch)
treeca1a798771dc044cf9f309217bef6ac0c60a4161
parent4a0823e5486f16b10762076d629f2f7e4d5da476 (diff)
parent0a9cb85a5cd03f9901fc7882ec6f348c22b195ac (diff)
downloadframeworks_base-8d0e37f5b142623b41b78ce5d19b4b650d53eb7f.zip
frameworks_base-8d0e37f5b142623b41b78ce5d19b4b650d53eb7f.tar.gz
frameworks_base-8d0e37f5b142623b41b78ce5d19b4b650d53eb7f.tar.bz2
Merge "docs: revise platform intro" into froyo
-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 7e62516..ab261f0 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>