diff options
| author | Owen Lin <owenlin@google.com> | 2011-11-22 17:48:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-22 17:48:49 -0800 |
| commit | 4cf8a3914aa365fefc6c231c48075ecc5a096a65 (patch) | |
| tree | e51452d97dfa32aae0aec9e3aad4bf23531d19a2 | |
| parent | f53453d59615e3709e683215ea4ddaf6daf9bc91 (diff) | |
| parent | 85c38af1d47e288775052cd188e3f014fa40e8a2 (diff) | |
| download | frameworks_base-4cf8a3914aa365fefc6c231c48075ecc5a096a65.zip frameworks_base-4cf8a3914aa365fefc6c231c48075ecc5a096a65.tar.gz frameworks_base-4cf8a3914aa365fefc6c231c48075ecc5a096a65.tar.bz2 | |
am 85c38af1: am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '85c38af1d47e288775052cd188e3f014fa40e8a2':
Fix 5654631. It forgot to consider the year in formatDateRange.
| -rw-r--r-- | core/java/android/text/format/DateUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index 22a7528..da10311 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -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)); } |