# HG changeset patch
# User amurillo
# Date 1390950035 28800
# Node ID 32f017489ba5dd1bedabb9fa1d26bcc74d0a72b6
# Parent  58879cd9f8dfdc5501698fe507ee24257282b59e# Parent  2185d483f5f8fbf815d814dc784b4ca8230c79a2
Merge

diff -r 58879cd9f8df -r 32f017489ba5 make/hotspot_version
--- a/make/hotspot_version	Tue Jan 28 09:51:25 2014 -0800
+++ b/make/hotspot_version	Tue Jan 28 15:00:35 2014 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=68
+HS_BUILD_NUMBER=69
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
diff -r 58879cd9f8df -r 32f017489ba5 src/share/vm/opto/c2_globals.hpp
--- a/src/share/vm/opto/c2_globals.hpp	Tue Jan 28 09:51:25 2014 -0800
+++ b/src/share/vm/opto/c2_globals.hpp	Tue Jan 28 15:00:35 2014 -0800
@@ -445,7 +445,7 @@
   notproduct(bool, PrintEliminateLocks, false,                              \
           "Print out when locks are eliminated")                            \
                                                                             \
-  product(bool, EliminateAutoBox, true,                                     \
+  product(bool, EliminateAutoBox, false,                                    \
           "Control optimizations for autobox elimination")                  \
                                                                             \
   experimental(bool, UseImplicitStableValues, false,                        \