resolved conflicts for merge of 90c4833f to eclair-mr2

diff --cc src/com/android/deskclock/AlarmClock.java
Simple merge

diff --cc src/com/android/deskclock/SetAlarm.java
index 83294c5,ce07cc1..2a14448
--- 1/src/com/android/deskclock/SetAlarm.java
--- 2/src/com/android/deskclock/SetAlarm.java
+++ b/src/com/android/deskclock/SetAlarm.java
@@@ -93,12 -95,7 +95,12 @@@ public class SetAlarm extends Preferenc
  
          /* load alarm details from database */
          Alarm alarm = Alarms.getAlarm(getContentResolver(), mId);
-         mEnabled = alarm.enabled;
 +        // Bad alarm, bail to avoid a NPE.
 +        if (alarm == null) {
 +            finish();
 +            return;
 +        }
+         mEnabledPref.setChecked(alarm.enabled);
          mLabel.setText(alarm.label);
          mLabel.setSummary(alarm.label);
          mHour = alarm.hour;
@@@ -142,8 -139,6 +144,8 @@@
          Button b = (Button) v.findViewById(R.id.alarm_save);
          b.setOnClickListener(new View.OnClickListener() {
                  public void onClick(View v) {
-                     mEnabled = true;
 +                    // Enable the alarm when clicking "Done"
++                    mEnabledPref.setChecked(true);
                      saveAlarm();
                      finish();
                  }