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

Commit 1dbd4a48 authored by Andrew Solovay's avatar Andrew Solovay Committed by android-build-merger
Browse files

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

am: 51f65bbc

Change-Id: If54feb86d47552ea89da661c7769a25efe669237
parents 619835e5 51f65bbc

Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -1003,7 +1003,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/23.txt 23 \

    -since $(SRC_API_DIR)/23.txt 23 \

    -since $(SRC_API_DIR)/24.txt 24 \

    -since $(SRC_API_DIR)/24.txt 24 \

    -since $(SRC_API_DIR)/25.txt 25 \

    -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 \

    -werror -hide 111 -hide 113 -hide 121 \

    -overview $(LOCAL_PATH)/core/java/overview.html \

    -overview $(LOCAL_PATH)/core/java/overview.html \