Integrate change cherry-picked for ticket #12410 into android_icu4j.
am: 3ad5c9d5a5
Change-Id: Ic65afe7f1ff440ff1f832a89c0d362eee48df3fe
diff --git a/android_icu4j/src/main/java/android/icu/text/MessageFormat.java b/android_icu4j/src/main/java/android/icu/text/MessageFormat.java
index e384a2a..de9f019 100644
--- a/android_icu4j/src/main/java/android/icu/text/MessageFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/MessageFormat.java
@@ -140,8 +140,8 @@
* and unquoted {curly braces} must occur in matched pairs.
* </ul>
*
- * <p>Recommendation: Use the real apostrophe (single quote) character \\u2019 for
- * human-readable text, and use the ASCII apostrophe (\\u0027 ' )
+ * <p>Recommendation: Use the real apostrophe (single quote) character \u2019 for
+ * human-readable text, and use the ASCII apostrophe (\u0027 ' )
* only in program syntax, like quoting in MessageFormat.
* See the annotations for U+0027 Apostrophe in The Unicode Standard.
*
diff --git a/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java b/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java
index f1126b4..df7cd2d 100644
--- a/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java
+++ b/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java
@@ -3334,7 +3334,7 @@
* property alias, or a special ID. Special IDs are matched
* loosely and correspond to the following sets:
*
- * "ANY" = [\\u0000-\\U0010FFFF],
+ * "ANY" = [\\u0000-\\u0010FFFF],
* "ASCII" = [\\u0000-\\u007F].
*
* @param valueAlias a value alias, either short or long. The
diff --git a/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java b/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java
index 84428a7..b2ee08d 100644
--- a/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java
@@ -167,7 +167,7 @@
* @param year The value used to set the calendar's {@link #YEAR YEAR} time field.
* @param month The value used to set the calendar's {@link #MONTH MONTH} time field.
* The value is 0-based. e.g., 0 for January.
- * @param isLeapMonth The value used to set the Chinese calendar's (@link #IS_LEAP_MONTH)
+ * @param isLeapMonth The value used to set the Chinese calendar's {@link #IS_LEAP_MONTH}
* time field.
* @param date The value used to set the calendar's {@link #DATE DATE} time field.
* @see Category#FORMAT
@@ -223,7 +223,7 @@
* @param year The value used to set the calendar's {@link #YEAR YEAR} time field.
* @param month The value used to set the calendar's {@link #MONTH MONTH} time field.
* The value is 0-based. e.g., 0 for January.
- * @param isLeapMonth The value used to set the Chinese calendar's (@link #IS_LEAP_MONTH)
+ * @param isLeapMonth The value used to set the Chinese calendar's {@link #IS_LEAP_MONTH}
* time field.
* @param date The value used to set the calendar's {@link #DATE DATE} time field.
* @see Category#FORMAT
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
index f31f5d5..9b2dd30 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
@@ -139,8 +139,8 @@
* and unquoted {curly braces} must occur in matched pairs.
* </ul>
*
- * <p>Recommendation: Use the real apostrophe (single quote) character \\u2019 for
- * human-readable text, and use the ASCII apostrophe (\\u0027 ' )
+ * <p>Recommendation: Use the real apostrophe (single quote) character \u2019 for
+ * human-readable text, and use the ASCII apostrophe (\u0027 ' )
* only in program syntax, like quoting in MessageFormat.
* See the annotations for U+0027 Apostrophe in The Unicode Standard.
*
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
index 92fb315..106259f 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
@@ -3409,7 +3409,7 @@
* property alias, or a special ID. Special IDs are matched
* loosely and correspond to the following sets:
*
- * "ANY" = [\\u0000-\\U0010FFFF],
+ * "ANY" = [\\u0000-\\u0010FFFF],
* "ASCII" = [\\u0000-\\u007F].
*
* @param valueAlias a value alias, either short or long. The
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
index 13140f3..605479c 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
@@ -169,7 +169,7 @@
* @param year The value used to set the calendar's {@link #YEAR YEAR} time field.
* @param month The value used to set the calendar's {@link #MONTH MONTH} time field.
* The value is 0-based. e.g., 0 for January.
- * @param isLeapMonth The value used to set the Chinese calendar's (@link #IS_LEAP_MONTH)
+ * @param isLeapMonth The value used to set the Chinese calendar's {@link #IS_LEAP_MONTH}
* time field.
* @param date The value used to set the calendar's {@link #DATE DATE} time field.
* @see Category#FORMAT
@@ -227,7 +227,7 @@
* @param year The value used to set the calendar's {@link #YEAR YEAR} time field.
* @param month The value used to set the calendar's {@link #MONTH MONTH} time field.
* The value is 0-based. e.g., 0 for January.
- * @param isLeapMonth The value used to set the Chinese calendar's (@link #IS_LEAP_MONTH)
+ * @param isLeapMonth The value used to set the Chinese calendar's {@link #IS_LEAP_MONTH}
* time field.
* @param date The value used to set the calendar's {@link #DATE DATE} time field.
* @see Category#FORMAT
