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

Commit acb195f0 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... 

Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a am: 51f65bbc am: 1dbd4a48
am: 5f2086fc

Change-Id: I3bb52b18a0ad8c8a88eb8faf43ec83c4f33c998c
parents a9d7b28b 5f2086fc

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -1015,7 +1015,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 \