summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Fernandez <joefernandez@google.com> 2015-08-13 18:42:51 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-13 18:42:51 +0000
commitdb5b38b23c629b18b9a92956c68f82dbaa4e22ef (patch)
tree4349791142961a3c3facfdbf710325ecd579fcf1
parent28918812028f69a6e2c81f56b31724edd35307ce (diff)
parent195b1fd2b1fbbd25bb18e263489f58a7b14a0139 (diff)
am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '195b1fd2b1fbbd25bb18e263489f58a7b14a0139': docs: Update developer docs make file to include API 23
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a7a2ecb6c6ce..18d9c69c0bc2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -750,6 +750,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since $(SRC_API_DIR)/20.txt 20 \
-since $(SRC_API_DIR)/21.txt 21 \
-since $(SRC_API_DIR)/22.txt 22 \
+ -since $(SRC_API_DIR)/23.txt 23 \
-werror -hide 111 -hide 113 \
-overview $(LOCAL_PATH)/core/java/overview.html
@@ -787,7 +788,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:=5.1
+framework_docs_SDK_VERSION:=6.0
# release version (ie "Release x") (full releases only)
framework_docs_SDK_REL_ID:=1