summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2017-07-28 20:30:26 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-28 20:30:26 +0000
commit1dbd4a48c56aa90ef356048b3a39c8c369472f16 (patch)
tree71f98a54c8d54ac741186bd40e1f72414f86b36f
parent619835e5e31b1f8672a41a081a43a7ba9d582208 (diff)
parent51f65bbcbff5f2d42df632114b6e8e9e3af10cb3 (diff)
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b
am: 51f65bbcbf Change-Id: If54feb86d47552ea89da661c7769a25efe669237
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 34547206e5f6..158751874bbc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1003,7 +1003,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 \