commit 8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4
author Joe Fernandez <joefernandez@google.com> Thu Aug 13 18:27:11 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 13 18:27:11 2015 +0000
tree 7a8ba8a1f4cbba592616d5d2f5f780f55e26339d
parent 226ae04df4b3570d11b66d52a404b2c8b2ac50db
parent 1827e3230dfc3610780f0ffdb704aa9c142aa22b

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

Android.mk

diff --git a/Android.mk b/Android.mk
index a7a2ecb..18d9c69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -750,6 +750,7 @@
     -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 @@
 
 ## 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