summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk/android-1.6.jd
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-09-16 11:19:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 11:19:54 -0700
commit8ee9ecc145c9e05faf13f4bcf5853c888760c1b6 (patch)
treeb9fa1f1ed062dab5359f545de4a4983a04a4a810 /docs/html/sdk/android-1.6.jd
parent03335af0dbf14d1eb4503be92a5b10199719898c (diff)
parent9afd90939b1c2b298592b803c0bfa0b54ff7e453 (diff)
downloadframeworks_base-8ee9ecc145c9e05faf13f4bcf5853c888760c1b6.zip
frameworks_base-8ee9ecc145c9e05faf13f4bcf5853c888760c1b6.tar.gz
frameworks_base-8ee9ecc145c9e05faf13f4bcf5853c888760c1b6.tar.bz2
am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp * commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453': Doc change: clean up droiddoc (cs) macros.
Diffstat (limited to 'docs/html/sdk/android-1.6.jd')
-rw-r--r--docs/html/sdk/android-1.6.jd4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/html/sdk/android-1.6.jd b/docs/html/sdk/android-1.6.jd
index c4e08ff..a01a5f6 100644
--- a/docs/html/sdk/android-1.6.jd
+++ b/docs/html/sdk/android-1.6.jd
@@ -2,8 +2,6 @@ page.title=Android 1.6 Platform
sdk.platform.version=1.6
sdk.platform.apiLevel=4
sdk.platform.majorMinor=minor
-sdk.platform.releaseDate=December 2009
-sdk.platform.deployableDate=October 2009
@jd:body
@@ -43,7 +41,7 @@ Differences Report &raquo;</a> </li>
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
-deployable to Android-powered handsets since {@sdkPlatformDeployableDate}.
+deployable to Android-powered handsets since October 2009.
The platform includes new features for users and developers, as well as changes
in the Android framework API. </p>