commit 85c38af1d47e288775052cd188e3f014fa40e8a2
author Owen Lin <owenlin@google.com> Tue Nov 22 17:46:35 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 22 17:46:35 2011 -0800
tree 26af9cc36fe43f3d9a45b65a929b381f92be7451
parent d49a56ce6405021b84ad4616f31d03f97732128c
parent 8bb56180d208b9264e5a56b49fe06b8471ccaced

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

* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.

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

diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java
index 353b628..7f8af7a 100644
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -1415,7 +1415,7 @@
             }
         }
 
-        if (noMonthDay && startMonthNum == endMonthNum) {
+        if (noMonthDay && startMonthNum == endMonthNum && startYear == endYear) {
             // Example: "January, 2008"
             return formatter.format("%s", startDate.format(defaultDateFormat));
         }