Merge
authorprr
Mon, 28 Mar 2016 08:41:54 -0700
changeset 36786 8f9057195e73
parent 36785 458d52e5d1d5 (diff)
parent 36720 7359994942f8 (current diff)
child 36787 402e5e40f6e5
Merge
hotspot/test/compiler/compilercontrol/jcmd/StressAddSequentiallyTest.java
jdk/make/src/native/genconstants/ch/genSocketOptionRegistry.c
jdk/make/src/native/genconstants/fs/genSolarisConstants.c
jdk/make/src/native/genconstants/fs/genUnixConstants.c
jdk/src/java.base/share/classes/sun/misc/Resource.java
jdk/src/java.base/share/classes/sun/misc/URLClassPath.java
jdk/src/java.base/unix/classes/sun/misc/FileURLMapper.java
jdk/src/java.base/windows/classes/sun/misc/FileURLMapper.java
jdk/src/jdk.deploy.osx/macosx/classes/module-info.java
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/messages.properties
--- a/make/common/CORE_PKGS.gmk	Wed Jul 05 21:30:26 2017 +0200
+++ b/make/common/CORE_PKGS.gmk	Mon Mar 28 08:41:54 2016 -0700
@@ -82,6 +82,7 @@
     java.awt \
     java.awt.color \
     java.awt.datatransfer \
+    java.awt.desktop \
     java.awt.dnd \
     java.awt.event \
     java.awt.font \