# HG changeset patch
# User asaha
# Date 1418405940 28800
# Node ID 4a039880d74c9537128946466710aa4e5c4f7376
# Parent  164ba3c8ada4bdcd2c34467040579651405bdd74# Parent  57ba74cc9bb2f77f49d073c8afe4ded29e206750
Merge

diff -r 164ba3c8ada4 -r 4a039880d74c .hgtags
--- a/.hgtags	Thu Dec 04 11:30:58 2014 -0800
+++ b/.hgtags	Fri Dec 12 09:39:00 2014 -0800
@@ -363,3 +363,4 @@
 a278e39ba58d104d0731db5ab5ea6cedf3084a1d jdk8u40-b15
 8893690584dac2df7cc2e9b0a5ffe107266a160b jdk8u40-b16
 83c4d5aca2ff8fd0c6b2a7091018b71313371176 jdk8u40-b17
+fa07311627d085f1307f55298f59463bcf55db02 jdk8u40-b18