am 2b98d8bf: resolved conflicts for merge of 01ec8332 to jb-mr1-dev-plus-aosp
* commit '2b98d8bf680a66ad90b5131d2662a21455f289b6':
Fix the SimpleDateFormat L/M E/c documentation.
diff --git a/luni/src/main/java/java/text/SimpleDateFormat.java b/luni/src/main/java/java/text/SimpleDateFormat.java
index 2af9d21..5c4017f 100644
--- a/luni/src/main/java/java/text/SimpleDateFormat.java
+++ b/luni/src/main/java/java/text/SimpleDateFormat.java
@@ -96,7 +96,10 @@
* <p>The two pattern characters {@code L} and {@code c} are ICU-compatible extensions, not
* available in the RI or in Android before Android 2.3 "Gingerbread" (API level 9). These
* extensions are necessary for correct localization in languages such as Russian
- * that distinguish between, say, "June" and "June 2010".
+ * that make a grammatical distinction between, say, the word "June" in the sentence "June" and
+ * in the sentence "June 10th"; the former is the stand-alone form, the latter the regular
+ * form (because the usual case is to format a complete date). The relationship between {@code E}
+ * and {@code c} is equivalent, but for weekday names.
*
* <p>Five-count patterns (such as "MMMMM") used for the shortest non-numeric
* representation of a field were introduced in Jelly Bean MR2 (API level 18).
