summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-01-29 13:52:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-29 13:52:20 -0800
commit604b8714024e1234821952d091be48cc6a86b794 (patch)
treed0b399a9cf8ab18891493aa7f280379f4105154e /Android.mk
parent6580a1449f1f3f1038ffc40d5d26f03bd60e8b7a (diff)
parentaa86da9d14d08ee39ca3e3fcabba01560c64f37d (diff)
downloadframeworks_base-604b8714024e1234821952d091be48cc6a86b794.zip
frameworks_base-604b8714024e1234821952d091be48cc6a86b794.tar.gz
frameworks_base-604b8714024e1234821952d091be48cc6a86b794.tar.bz2
am aa86da9d: am 196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit 'aa86da9d14d08ee39ca3e3fcabba01560c64f37d' * commit 'aa86da9d14d08ee39ca3e3fcabba01560c64f37d': SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 7717c76..f225ecd8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -399,7 +399,7 @@ web_docs_sample_code_flags := \
## SDK version identifiers used in the published docs
# major[.minor] version for current SDK. (full releases only)
-framework_docs_SDK_VERSION:=2.0.1
+framework_docs_SDK_VERSION:=2.1
# release version (ie "Release x") (full releases only)
framework_docs_SDK_REL_ID:=1
# name of current SDK directory (full releases only)