Commit 4cf8a391 authored Nov 22, 2011 by Owen Lin Committed by Android Git Automerger Nov 22, 2011

am 85c38af1: am 8bb56180: Merge "Fix 5654631. It forgot to consider the year...

am 85c38af1: am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1

* commit '85c38af1':
  Fix 5654631. It forgot to consider the year in formatDateRange.

parents f53453d5 85c38af1

core/java/android/text/format/DateUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1412,7 +1412,7 @@ public class DateUtils
		}
		}

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