diff options
author | Dirk Dougherty <ddougherty@google.com> | 2010-01-29 13:52:20 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-29 13:52:20 -0800 |
commit | 604b8714024e1234821952d091be48cc6a86b794 (patch) | |
tree | d0b399a9cf8ab18891493aa7f280379f4105154e /Android.mk | |
parent | 6580a1449f1f3f1038ffc40d5d26f03bd60e8b7a (diff) | |
parent | aa86da9d14d08ee39ca3e3fcabba01560c64f37d (diff) | |
download | frameworks_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.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |