Snap for 4829593 from e4ccb5c14e590a7acb60983e237efa57fd353631 to pi-release
Change-Id: I00c35dde45d5ba9df6649f63099cab821ac054fb
diff --git a/android_icu4j/src/main/java/android/icu/text/BreakIterator.java b/android_icu4j/src/main/java/android/icu/text/BreakIterator.java
index 3e391f6..8a3c9db 100644
--- a/android_icu4j/src/main/java/android/icu/text/BreakIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/BreakIterator.java
@@ -82,7 +82,10 @@
*
* BreakIterator accesses the text it analyzes through a CharacterIterator, which makes
* it possible to use BreakIterator to analyze text in any text-storage vehicle that
- * provides a CharacterIterator interface.
+ * provides a CharacterIterator interface. When BreakIterator.setText(CharacterIterator) or
+ * getText() was called, the CharacterIterator must not be modified, or else the BreakIterator
+ * behavior is undefined. In particular, call BreakIterator.setText(),
+ * not CharacterIterator.setText().
*
* <b>Note:</b> Some types of BreakIterator can take a long time to create, and
* instances of BreakIterator are not currently cached by the system. For
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java
index 451b8c0..a458ad3 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java
@@ -81,7 +81,10 @@
*
* BreakIterator accesses the text it analyzes through a CharacterIterator, which makes
* it possible to use BreakIterator to analyze text in any text-storage vehicle that
- * provides a CharacterIterator interface.
+ * provides a CharacterIterator interface. When BreakIterator.setText(CharacterIterator) or
+ * getText() was called, the CharacterIterator must not be modified, or else the BreakIterator
+ * behavior is undefined. In particular, call BreakIterator.setText(),
+ * not CharacterIterator.setText().
*
* <b>Note:</b> Some types of BreakIterator can take a long time to create, and
* instances of BreakIterator are not currently cached by the system. For
