# HG changeset patch
# User jwilhelm
# Date 1565210629 -7200
# Node ID b948b920e29fc90a604e88906b9f4a779bd6a392
# Parent  4e3a26572bb6d98e3b7b0a634f8f338d5d141251# Parent  5c85b58e2a42197c2425fb766bf510ccf60d8c06
Merge

diff -r 4e3a26572bb6 -r b948b920e29f src/java.base/share/classes/java/util/Locale.java
--- a/src/java.base/share/classes/java/util/Locale.java	Wed Aug 07 20:47:43 2019 +0000
+++ b/src/java.base/share/classes/java/util/Locale.java	Wed Aug 07 22:43:49 2019 +0200
@@ -929,7 +929,7 @@
      * if no locale is explicitly specified. It can be changed using the
      * setDefault(Locale.Category, Locale) method.
      *
-     * @param category - the specified category to get the default locale
+     * @param category the specified category to get the default locale
      * @throws NullPointerException if category is null
      * @return the default locale for the specified Category for this instance
      *     of the Java Virtual Machine
@@ -1075,8 +1075,8 @@
      * prepared to reinitialize locale-sensitive code running within the
      * same Java Virtual Machine.
      *
-     * @param category - the specified category to set the default locale
-     * @param newLocale - the new default locale
+     * @param category the specified category to set the default locale
+     * @param newLocale the new default locale
      * @throws SecurityException if a security manager exists and its
      *     checkPermission method doesn't allow the operation.
      * @throws NullPointerException if category and/or newLocale is null
diff -r 4e3a26572bb6 -r b948b920e29f test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java