Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b am: 51f65bbcbf

am: 1dbd4a48c5

Change-Id: I8ae0c12093620fd14fe60e5b7f653df4cdb2db67
This commit is contained in:
Andrew Solovay
2017-07-28 22:00:35 +00:00
committed by android-build-merger

View File

@@ -1013,7 +1013,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 \