diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-03-03 02:07:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 02:07:57 +0000 |
| commit | 412e3951474c0939f2c10f1d381df45d01e00b55 (patch) | |
| tree | d69a8635d79856ee4d885bf94488bdac8f19e3e5 /Android.mk | |
| parent | e88d25b9a898cd226d37d75e8e62caac0c88496a (diff) | |
| parent | f76b6c988af5a6024bcf20a2b51bf5b319b8ae50 (diff) | |
| download | frameworks_base-412e3951474c0939f2c10f1d381df45d01e00b55.zip frameworks_base-412e3951474c0939f2c10f1d381df45d01e00b55.tar.gz frameworks_base-412e3951474c0939f2c10f1d381df45d01e00b55.tar.bz2 | |
am f76b6c98: am 66b4366e: am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
* commit 'f76b6c988af5a6024bcf20a2b51bf5b319b8ae50':
docs: update Android docs build to include API 22, Android 5.1
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -733,6 +733,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/19.txt 19 \ -since $(SRC_API_DIR)/20.txt 20 \ -since $(SRC_API_DIR)/21.txt 21 \ + -since $(SRC_API_DIR)/22.txt 22 \ -werror -hide 111 -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html @@ -769,7 +770,7 @@ sample_groups := -samplegroup Admin \ ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) -framework_docs_SDK_VERSION:=4.4 +framework_docs_SDK_VERSION:=5.1 # release version (ie "Release x") (full releases only) framework_docs_SDK_REL_ID:=1 |