commit | ead9117ec01d50af53c214c5f6b8a88f51532ca1 | [log] [tgz] |
---|---|---|
author | Yi Kong <yikong@google.com> | Tue Jan 05 14:46:40 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 05 14:46:40 2016 +0000 |
tree | 3fd7918dd4e50589044e7ce0f4f7423b485d8cb7 | |
parent | b1ff2d4c2d0f755a4460e8e033538167b5ab590e [diff] | |
parent | 7e2649e490f1da8c6c859a6c76d2199e1d9fb516 [diff] |
Merge "Check for leniency of calendar in getDisplayNames"
diff --git a/ojluni/src/main/java/java/util/Calendar.java b/ojluni/src/main/java/java/util/Calendar.java index 49a1a1a..09f3a65 100755 --- a/ojluni/src/main/java/java/util/Calendar.java +++ b/ojluni/src/main/java/java/util/Calendar.java
@@ -1449,6 +1449,7 @@ ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) { return null; } + complete(); // ALL_STYLES if (style == ALL_STYLES) {