commit 6af70a85299bfc8e8982fd823b5c7b65a138695e
author Jesper Wilhelmsson <jwilhelm@openjdk.org> Tue Apr 25 20:24:24 2017 +0200
committer Jesper Wilhelmsson <jwilhelm@openjdk.org> Tue Apr 25 20:24:24 2017 +0200
tree 0a4892e07aea6418e9f0bb1a918fd19a91a1ea1b
parent 77fb3fecd51a0b706101e0d08a8fedfbeb6e6420
parent daf2c467cf8b6f1ec523ef0663c4c2fef37152f3

Merge

.hgtags-top-repo

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index b5a82c4..9f78abd 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -400,6 +400,7 @@
 8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
 688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155
 783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156
+4df5f619c9ead4604d2f97ed231b3a35ec688c41 jdk-10+1
 4eb77fb98952dc477a4229575c81d2263a9ce711 jdk-9+157
 a4087bc10a88a43ea3ad0919b5b4af1c86977221 jdk-9+158
 fe8466adaef8178dba94be53c789a0aaa87d13bb jdk-9+159

common/autoconf/generated-configure.sh

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index e0a1375..2413438 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -5139,7 +5139,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1493062456
+DATE_WHEN_GENERATED=1493144658
 
 ###############################################################################
 #