Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1

2011-11-22 17:44:52 -08:00
parent 1889bb49a4 b193e35ed1
commit 8bb56180d2
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -1415,7 +1415,7 @@ public class DateUtils
            }
        }

-        if (noMonthDay && startMonthNum == endMonthNum) {
+        if (noMonthDay && startMonthNum == endMonthNum && startYear == endYear) {
            // Example: "January, 2008"
            return formatter.format("%s", startDate.format(defaultDateFormat));
        }