# HG changeset patch
# User asaha
# Date 1403808176 25200
# Node ID 8ade97377608ba4d6cdc9212d9a2ca123e285c2b
# Parent  67d1495a24ef1a6a9ce2e739f6a42e814fda748c
8048270: Resolve autoconf and other merge issue from 8u20-b20 to 8u25
Reviewed-by: katleman

diff -r 67d1495a24ef -r 8ade97377608 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Jun 26 08:27:47 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Jun 26 11:42:56 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=1401908461
+DATE_WHEN_GENERATED=1403797630
 
 ###############################################################################
 #