reconcile main tree with open-source eclair
diff --git a/tests/src/com/android/calendar/FormatDateRangeTest.java b/tests/src/com/android/calendar/FormatDateRangeTest.java
index 548fc1c..38d6bc0 100644
--- a/tests/src/com/android/calendar/FormatDateRangeTest.java
+++ b/tests/src/com/android/calendar/FormatDateRangeTest.java
@@ -172,7 +172,7 @@
new DateTest(
Calendar.getInstance().get(Calendar.YEAR) - 1, 0, 3, 13, 0,
DateUtils.FORMAT_SHOW_DATE,
- "January 3, 2008"),
+ "January 3, " + (Calendar.getInstance().get(Calendar.YEAR) - 1)),
};
@Override