# HG changeset patch
# User duke
# Date 1499285490 -7200
# Node ID 535c39eb136d32112b8e5496a5ab643a6e3a32cb
# Parent  d9f374de016030a51ecdd20aff7e272088d21bbd# Parent  0ad35b2dfc5013f8c3f837d944c96c7dc1381c1c
Merge

diff -r d9f374de0160 -r 535c39eb136d .hgtags-top-repo
--- a/.hgtags-top-repo	Mon Sep 12 22:04:48 2016 +0000
+++ b/.hgtags-top-repo	Wed Jul 05 22:11:30 2017 +0200
@@ -377,3 +377,4 @@
 a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
 be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
 065724348690eda41fc69112278d8da6dcde548c jdk-9+134
+82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
diff -r d9f374de0160 -r 535c39eb136d hotspot/.hgtags
--- a/hotspot/.hgtags	Mon Sep 12 22:04:48 2016 +0000
+++ b/hotspot/.hgtags	Wed Jul 05 22:11:30 2017 +0200
@@ -537,3 +537,4 @@
 713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
 a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
 b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
+3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135
diff -r d9f374de0160 -r 535c39eb136d make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Mon Sep 12 22:04:48 2016 +0000
+++ b/make/CompileJavaModules.gmk	Wed Jul 05 22:11:30 2017 +0200
@@ -458,7 +458,7 @@
 jdk.localedata_COPY := _dict _th
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
-jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
+jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
 
 ################################################################################
 # Setup the compilation for the module
diff -r d9f374de0160 -r 535c39eb136d make/CreateJmods.gmk