summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2017-07-28 20:05:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-07-28 20:05:04 +0000
commit04d43a6a7b78c18fe3c894f25b08b3802df7f78f (patch)
treec8c2fde463fcf33258195f5758df80626ba4f340
parent91f16ace4f3121a34b038dd453386b9d4daf826a (diff)
parentfdad0ba193b597adfc5f1724cb1e368f11ebf825 (diff)
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 3f2ae83294a0..3f059ae86dce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -950,7 +950,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since $(SRC_API_DIR)/23.txt 23 \
-since $(SRC_API_DIR)/24.txt 24 \
-since $(SRC_API_DIR)/25.txt 25 \
- -since ./frameworks/base/api/current.txt O \
+ -since $(SRC_API_DIR)/26.txt 26 \
-werror -hide 111 -hide 113 -hide 121 \
-overview $(LOCAL_PATH)/core/java/overview.html \