Merge "Set -Xdoclint:none"
diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 1e9de1c..1421761 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -209,6 +209,7 @@
                 \@$(PRIVATE_SRC_LIST_FILE) \
                 -J-Xmx1024m \
                 -XDignore.symbol.file \
+                $(if $(EXPERIMENTAL_USE_JAVA8),-Xdoclint:none) \
                 $(PRIVATE_PROFILING_OPTIONS) \
                 $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
                 $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \