am b854bced: am 9b8bc3dc: am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev

* commit 'b854bced88d7ca46284830d9f6b728e2f2363929':
  docs: Update developer docs make file to include API 23
This commit is contained in:
Joe Fernandez
2015-08-13 21:07:06 +00:00
committed by Android Git Automerger

View File

@@ -752,6 +752,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
@@ -790,7 +791,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