commit 19f09fb127cd193023fe518f4fe3ae890c1b52d4
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 27 08:21:40 2012 -0800
committer The Android Open Source Project <initial-contribution@android.com> Tue Nov 27 08:21:40 2012 -0800
tree 41c9285106acbc595b8d5a583aa122fb0a116b6c
parent 9cd44a18c7d208cac0dc3c213cf4d6567cc945e0
parent 401299739295b2305707810bbae2e49eadac50ba

Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f

src/com/android/settings/DateTimeSettings.java

diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 53f25a2..98c3887 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -118,6 +118,10 @@
         if (currentFormat == null) {
             currentFormat = "";
         }
+
+        // Prevents duplicated values on date format selector.
+        mDummyDate.set(mDummyDate.get(Calendar.YEAR), mDummyDate.DECEMBER, 31, 13, 0, 0);
+
         for (int i = 0; i < formattedDates.length; i++) {
             String formatted =
                     DateFormat.getDateFormatForSetting(getActivity(), dateFormats[i])