am 3dd51556: Merge "Remove vestigial "Choose date format" option."

* commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee':
  Remove vestigial "Choose date format" option.

diff --cc res/values/arrays.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc res/xml/date_time_prefs.xml
Simple merge

diff --cc src/com/android/settings/DateTimeSettings.java
index f34008d,215866c..6f41fd5
--- 1/src/com/android/settings/DateTimeSettings.java
--- 2/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@@ -69,13 -68,12 +68,12 @@@ public class DateTimeSettings extends S
      // have we been launched from the setup wizard?
      protected static final String EXTRA_IS_FIRST_RUN = "firstRun";
  
 -    private CheckBoxPreference mAutoTimePref;
 +    private SwitchPreference mAutoTimePref;
      private Preference mTimePref;
      private Preference mTime24Pref;
 -    private CheckBoxPreference mAutoTimeZonePref;
 +    private SwitchPreference mAutoTimeZonePref;
      private Preference mTimeZone;
      private Preference mDatePref;
-     private ListPreference mDateFormat;
  
      @Override
      public void onCreate(Bundle icicle) {

diff --cc src/com/android/settings/fuelgauge/BatteryHistoryChart.java
Simple merge