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

Commit 796f1af0 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

parents 0d8f88b2 2518895c

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/7.xml 7 \

    -since ./frameworks/base/api/8.xml 8 \

    -since ./frameworks/base/api/9.xml 9 \

    -since ./frameworks/base/api/10.xml 10 \

    -since ./frameworks/base/api/current.xml Honeycomb \

		-werror -hide 113 \

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