# HG changeset patch
# User asaha
# Date 1433388423 25200
# Node ID e9403d389e3f99c98fe4ffd8eaa6743cbf759f68
# Parent  1abaece9c0daf071ebf476c827cecaed6517c6ea# Parent  ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f
Merge

diff -r 1abaece9c0da -r e9403d389e3f .hgtags
--- a/.hgtags	Thu May 28 20:38:34 2015 -0700
+++ b/.hgtags	Wed Jun 03 20:27:03 2015 -0700
@@ -436,3 +436,4 @@
 7ed130e10665ae5bed82aa8c4cdc18373292a6d7 jdk8u60-b15
 08a417ec9b3eea2f02eb02c7b7635f9701813f65 jdk8u60-b16
 ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17
+d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18
diff -r 1abaece9c0da -r e9403d389e3f make/Javadoc.gmk
--- a/make/Javadoc.gmk	Thu May 28 20:38:34 2015 -0700
+++ b/make/Javadoc.gmk	Wed Jun 03 20:27:03 2015 -0700
@@ -1212,8 +1212,7 @@
 # jaccessdocs - Java Accessibility Utilities
 #
 
-# Disable generation for now due to build break of nightly
-#ALL_OTHER_TARGETS += jaccessdocs
+ALL_OTHER_TARGETS += jaccessdocs
 
 JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec
 JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI)