Merge tag jb8u212-b1586.4
Change-Id: I9da87d83909a618b050e336e51b5aa4fff6eff1c
diff --git a/.hgtags b/.hgtags
index 0fb7081..cdbfde5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -952,3 +952,54 @@
3eb4c8be649b8772eb0e82ce80366e4625ea3397 jdk8u192-b12
4bbe353fcc36f1da3ead0c874e15bb649337c183 jdk8u192-b26
29d5186cdb7c5c0a47de00e6487ccaa1dffd85a6 jdk8u202-b01
+6be61de8b2a753b117c525dfefb7f357036e0da2 jdk8u202-b02
+0f0df1c7190a7435d796b268d152883c7b86a821 jdk8u202-b03
+16424331a075b9d4a5f874f5072393cd83c863c5 jdk8u202-b04
+08a36f013df27134878b8ce4af10bf7b4c280de0 jdk8u202-b05
+0bab06166b752fd5dc64e0f087afbb761db7b667 jdk8u202-b06
+d050098ff289bdf42e642fff35a11a15e377624e jdk8u202-b07
+95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-b08
+15d8c732039b3537a3ec774b6c8df5af3fd71b57 jdk8u202-b25
+c0f526208190beea95ec99b06655603537c761f0 jdk8u202-b26
+95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-ga
+107b71b590ec4cb3f947674c4cac78eb97ad0899 jdk8u181-b31
+46f42ead87aab68740f95a5eb27a09d120853b10 jdk8u181-b32
+0ce50eb7c16fd346a9438fad9c76a2f96f806baf jdk8u181-b33
+de209b077cbca2bdd266b6abbd4d55309186264d jdk8u181-b34
+d0895208bafb94254b51eb6f915d809c055b5685 jdk8u181-b35
+22576f8af4bd380e1b1201ca77f8c2ff1251a221 jdk8u181-b36
+8d841e832cc0cad3182b5bcd662fadb058c516a7 jdk8u181-b37
+30d61da05c3b7cb5bf1437d628a6ce894dd9b371 jdk8u201-b01
+8c18711ab932e0abc015334e0981072dd1197205 jdk8u201-b02
+4a4ded3965b6691d1253e1271387267439f11022 jdk8u201-b03
+a7f48b9dfb8271c4c2d1110be7d9029add38ae1c jdk8u201-b04
+7909abb85562f12136732b785cd49f19c1d72663 jdk8u201-b74
+14d6465af4ec838b123cf8b47cd0c83ca2321ce2 jdk8u201-b05
+5129e794a75f8d098d26036b17e1ce71e2978343 jdk8u201-b75
+772887000640e33b3199f1516e0e0d10f2473cff jdk8u201-b06
+a7a52249333b941367f94f16743ea4c6e004a0f7 jdk8u201-b76
+4fbee4ebd4d32b302367c44f5e63b1bd647490f1 jdk8u201-b07
+dd3348cbc2d0651582fa8ede11c58e6bdd365c61 jdk8u201-b77
+8c8f74830128f0b244d878920df032e704d35eee jdk8u201-b08
+689d7755e8c17c5e18a8b86e01e4064695e74ee5 jdk8u201-b09
+7d4b8157ceddfc1adacdf1fe8fd35d7ec10b7a9b jdk8u201-b79
+4466875577d86dd5c16a9f6885909ba831653acb jdk8u201-b25
+60ed5e6cf44f898046eac40f66bf41c8e753c8e1 jdk8u201-b26
+689d7755e8c17c5e18a8b86e01e4064695e74ee5 jdk8u201-ga
+29d5186cdb7c5c0a47de00e6487ccaa1dffd85a6 jdk8u202-b01
+6be61de8b2a753b117c525dfefb7f357036e0da2 jdk8u202-b02
+0f0df1c7190a7435d796b268d152883c7b86a821 jdk8u202-b03
+16424331a075b9d4a5f874f5072393cd83c863c5 jdk8u202-b04
+08a36f013df27134878b8ce4af10bf7b4c280de0 jdk8u202-b05
+0bab06166b752fd5dc64e0f087afbb761db7b667 jdk8u202-b06
+d050098ff289bdf42e642fff35a11a15e377624e jdk8u202-b07
+95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-b08
+15d8c732039b3537a3ec774b6c8df5af3fd71b57 jdk8u202-b25
+c0f526208190beea95ec99b06655603537c761f0 jdk8u202-b26
+95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-ga
+075120a8b410485605fffd5bef20ab66ed97bef8 jdk8u212-b00
+f301c2612d6092ca64b0ba1807a07cf25941bc3b jdk8u212-b01
+59ab73ca14e84b4970ac1feb1ddb3f3d9a087d81 jdk8u212-b02
+4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-b03
+075e7154cddf75a861c657c6177797fdfbf36d3f jdk8u212-b04
+4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-ga
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index a1662fe..2247356 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1096,33 +1096,6 @@
OF SUCH DAMAGE.
--- end of LICENSE ---
-%% This notice is provided with respect to FontConfig 2.5, which may be
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright ?? 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-the name of Keith Packard not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-Keith Packard makes no representations about the suitability of this software
-for any purpose. It is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
---- end of LICENSE ---
-
-------------------------------------------------------------------------------
%% This notice is provided with respect to freebXML Registry 3.0 & 3.1,
@@ -1668,13 +1641,13 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to Little CMS 2.7, which may be
+%% This notice is provided with respect to Little CMS 2.9, which may be
included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
Little CMS
-Copyright (c) 1998-2015 Marti Maria Saguer
+Copyright (c) 1998-2011 Marti Maria Saguer
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
index 3b6f660..6e2b10e 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
@@ -84,7 +84,7 @@
doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30B5\u30DE\u30EA\u30FC
doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Enums=\u5217\u6319\u578B
+doclet.Enums=\u5217\u6319
doclet.AnnotationTypes=\u6CE8\u91C8\u578B
doclet.Exceptions=\u4F8B\u5916
doclet.Errors=\u30A8\u30E9\u30FC
@@ -102,9 +102,9 @@
doclet.AnnotationType=\u6CE8\u91C8\u578B
doclet.annotationtype=\u6CE8\u91C8\u578B
doclet.annotationtypes=\u6CE8\u91C8\u578B
-doclet.Enum=\u5217\u6319\u578B
-doclet.enum=\u5217\u6319\u578B
-doclet.enums=\u5217\u6319\u578B
+doclet.Enum=\u5217\u6319
+doclet.enum=\u5217\u6319
+doclet.enums=\u5217\u6319
doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
doclet.class=\u30AF\u30E9\u30B9
diff --git a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 2f2d16c..2670fec 100644
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -1482,7 +1482,7 @@
compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-compiler.misc.kindname.enum=\u5217\u6319\u578B
+compiler.misc.kindname.enum=\u5217\u6319
compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
