# HG changeset patch
# User asaha
# Date 1412696321 25200
# Node ID c4de614efd7affc001715aa5a7040620924ac44a
# Parent  fd3069eccd782cef184f3c2b3d3cc5e2cb30174a# Parent  b991a2a24a96ebf1aba15383d7749dde65772f87
Merge

diff -r fd3069eccd78 -r c4de614efd7a .hgtags
--- a/.hgtags	Wed Sep 24 08:49:20 2014 -0700
+++ b/.hgtags	Tue Oct 07 08:38:41 2014 -0700
@@ -332,3 +332,4 @@
 6e0c19cd42d7c4d307bea26840ee831cbd14e2fc jdk8u25-b15
 7fa6fa7cc204de988e224c6f8f75e62128fa84cd jdk8u25-b16
 53ca196be1ae098466976c017b166d4ce180c36f jdk8u25-b17
+a4f0c6dd8f97d4dd89baf09463c748abea9b3ed7 jdk8u25-b18