# HG changeset patch
# User asaha
# Date 1472590394 25200
# Node ID 720d0f9b06baac528ee5c6132518e47469f053bd
# Parent  19a21c4d3705151cac85f66ea68a77a4f249e95a# Parent  2bcef3a289916a27c6b97bde722a654f8ebc7d4f
Merge

diff -r 19a21c4d3705 -r 720d0f9b06ba .hgtags
--- a/.hgtags	Tue Aug 16 13:37:18 2016 -0700
+++ b/.hgtags	Tue Aug 30 13:53:14 2016 -0700
@@ -632,6 +632,8 @@
 56b0df415b570e31dc0b97d4a1c8f28b85240089 jdk8u102-b13
 0549bf2f507dae59bfcd7d11e038cdc62376fee7 jdk8u102-b14
 d86027f25a9aa960d69cf3a524588a873ae888f5 jdk8u102-b31
+1b511d4e93e7128ccb7100110ab6604eb2838afa jdk8u102-b32
+3d4b72198b23108f93ccf36b8d9275cc3b40ee1e jdk8u102-b33
 90f493bfe1faca0573844fdd2497070c8b224d76 jdk8u111-b00
 085fd7e08f4855f134a8048251c4535ddde1feee jdk8u111-b01
 f66a535fb6b3b41419c987cc90407507a64712b2 jdk8u111-b02
@@ -642,6 +644,7 @@
 405b1845ab3995b43efe0e770070b90f4c5c9080 jdk8u111-b07
 8a30511b2ea4714f5868b33be07b0562bb1edbfb jdk8u111-b08
 62cbd4997d4bf8433186d3fa30847577aa483ea3 jdk8u111-b09
+74b16a9a8eda03779e55ba145bdb6a08a1ebd780 jdk8u111-b10
 27503e49de52b54dde3a12af28e2d2de473192b3 jdk8u112-b00
 60a0572cd449e33b7d48b5a40065222ab5accd36 jdk8u112-b01
 6e20b82db75fbaf5a3e10455d1a28c17381f4be6 jdk8u112-b02
@@ -651,4 +654,6 @@
 35cb56e983d317fd319d2dbb17282264edea02e2 jdk8u112-b07
 103e6e2225bbbe779435b2e122e1ff846be54759 jdk8u112-b08
 ea5711153422cc1f8d710de08b7f4dc9e20b9333 jdk8u112-b09
+96658afeb900cb1bfc6c56b352745f3ede0ee524 jdk8u112-b10
+0169856d09008e5718f53a5d6c16e7db95c55887 jdk8u112-b11
 5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u121-b00
diff -r 19a21c4d3705 -r 720d0f9b06ba src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
--- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Aug 16 13:37:18 2016 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Aug 30 13:53:14 2016 -0700
@@ -34,7 +34,7 @@
 javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5148\u982D\u306B\u4ED8\u52A0
+javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5148\u982D\u306B\u4ED8\u52A0\u3059\u308B
 javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
 javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B