# HG changeset patch
# User asaha
# Date 1500058460 25200
# Node ID 1d8ca36bed747e703d5049f3a678e884d4db83f4
# Parent  413d79cfbec1a3becacaf7cbc353440e2ea10ee8# Parent  45ebe647a00e732bbe02904130e519784dd58a01
Merge

diff -r 413d79cfbec1 -r 1d8ca36bed74 .hgtags
--- a/.hgtags	Mon Jul 03 15:55:40 2017 -0700
+++ b/.hgtags	Fri Jul 14 11:54:20 2017 -0700
@@ -719,11 +719,15 @@
 96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12
 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
+48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
+123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
+f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32
 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
 9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
 00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00
 66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
+6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
 b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
 73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
 89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
diff -r 413d79cfbec1 -r 1d8ca36bed74 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Mon Jul 03 15:55:40 2017 -0700
+++ b/THIRD_PARTY_README	Fri Jul 14 11:54:20 2017 -0700
@@ -2808,12 +2808,12 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.11, which may be included 
+%% This notice is provided with respect to zlib v1.2.8, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.11, January 15th, 2017
+  version 1.2.8, April 28th, 2013
 
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler