diff options
| author | Scott Main <smain@google.com> | 2010-05-19 12:09:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 12:09:04 -0700 |
| commit | 8bf77456cec82cbda3393a4e48f265af1670e795 (patch) | |
| tree | 2734ca6df7d3ef2adf364d1c08b6b853cf70f06c | |
| parent | ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed (diff) | |
| parent | 8d0e37f5b142623b41b78ce5d19b4b650d53eb7f (diff) | |
| download | frameworks_base-8bf77456cec82cbda3393a4e48f265af1670e795.zip frameworks_base-8bf77456cec82cbda3393a4e48f265af1670e795.tar.gz frameworks_base-8bf77456cec82cbda3393a4e48f265af1670e795.tar.bz2 | |
am 8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp
* commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
docs: revise platform intro
| -rw-r--r-- | docs/html/sdk/android-2.2.jd | 5 |
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 »</a> </li> <p> <em>API Level:</em> <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> |