Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 195b1fd2 authored by Joe Fernandez's avatar Joe Fernandez Committed by Android Git Automerger
Browse files

am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev 

* commit '8d149d7f':
  docs: Update developer docs make file to include API 23
parents 045ffe31 8d149d7f

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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