# HG changeset patch
# User duke
# Date 1499290633 -7200
# Node ID 036dbf8b381798e5d31065109714d04d97bf98a4
# Parent  1e5f410302d2f4b2e5bc91c60d9b1d2a8ca8b363# Parent  08280c52dc423b5b805b7ee4b9ab011765d5b075
Merge

diff -r 1e5f410302d2 -r 036dbf8b3817 .hgtags
--- a/.hgtags	Wed Jul 05 23:36:59 2017 +0200
+++ b/.hgtags	Wed Jul 05 23:37:13 2017 +0200
@@ -1,3 +1,4 @@
+dad6746278facbbea57dd462cb56fb743dc0a5f0 jdk-9+172
 643b5f18c2656fe91b69fea85b07b98d5fad394d jdk-9+171
 898cbe31fbdae2d25d141384fac746cc244a730c jdk-9+170
 c7efde2b60fc1ec04630be769d9ad60efb39c39c jdk-9+169
diff -r 1e5f410302d2 -r 036dbf8b3817 jdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
diff -r 1e5f410302d2 -r 036dbf8b3817 jdk/test/lib/testlibrary/bootlib/java.base/java/util/SpliteratorOfIntDataBuilder.java
diff -r 1e5f410302d2 -r 036dbf8b3817 jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java
diff -r 1e5f410302d2 -r 036dbf8b3817 jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestScenario.java
diff -r 1e5f410302d2 -r 036dbf8b3817 jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestScenario.java
diff -r 1e5f410302d2 -r 036dbf8b3817 jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestScenario.java
diff -r 1e5f410302d2 -r 036dbf8b3817 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
diff -r 1e5f410302d2 -r 036dbf8b3817 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java