# HG changeset patch
# User lana
# Date 1414811855 25200
# Node ID 43ccc2b9d5b7c06baca33162c6aff8900fa76b65
# Parent  9f996a9338b85ec03c4d0d6999717a36a98b18a1# Parent  196ee1e3add0db0da1da625cd1c2ede987f47dcb
Merge

diff -r 9f996a9338b8 -r 43ccc2b9d5b7 make/Javadoc.gmk
--- a/make/Javadoc.gmk	Wed Oct 29 10:50:28 2014 -0700
+++ b/make/Javadoc.gmk	Fri Oct 31 20:17:35 2014 -0700
@@ -311,6 +311,13 @@
 #################################################################
 
 #
+# Load custom Javadoc rules, if present
+#
+-include $(CUSTOM_MAKE_DIR)/Javadoc.gmk
+
+#################################################################
+
+#
 # Default target is same as docs target, create core api and all others it can
 #