Merge

05fee252 · asaha · ce155b6f · dac3d340 · 05fee252 · 05fee252
3 changed file
--- a/make/java/java/FILES_java.gmk
+++ b/make/java/java/FILES_java.gmk
@@ -251,6 +251,7 @@ JAVA_JAVA_java = \
 	java/util/IdentityHashMap.java \
 	java/util/EnumMap.java \
    java/util/Arrays.java \
+    java/util/DualPivotQuicksort.java \
    java/util/TimSort.java \
    java/util/ComparableTimSort.java \
    java/util/ConcurrentModificationException.java \

--- a/src/share/classes/java/util/Arrays.java
+++ b/src/share/classes/java/util/Arrays.java
--- a/src/share/classes/java/util/DualPivotQuicksort.java
+++ b/src/share/classes/java/util/DualPivotQuicksort.java