# HG changeset patch
# User asaha
# Date 1401856861 25200
# Node ID 7f0a1578e4a102373226782fa054c5501bdfd5e4
# Parent  34160d2c17a50a7dc8c0119996c777791206b95f
8044749: Resolve autoconf and other merge issue from 8u20 to 8u25
Reviewed-by: katleman

diff -r 34160d2c17a5 -r 7f0a1578e4a1 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu May 29 10:50:00 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Jun 03 21:41:01 2014 -0700
@@ -3868,7 +3868,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1397150809
+DATE_WHEN_GENERATED=1401397653
 
 ###############################################################################
 #