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

Commit 66f3ca1c authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to... 

am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '796f1af0':
  enable preview mode for docs and add api level 10 flag for api level diffs
parents 3a6b7be2 796f1af0

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,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