resolved conflicts for merge of da3b21c3 to eclair-mr2

diff --cc src/com/android/deskclock/AlarmClock.java
index 86983b1,e9d5e78..5919300
--- 1/src/com/android/deskclock/AlarmClock.java
--- 2/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@@ -77,12 -76,9 +74,9 @@@ public class AlarmClock extends Activit
          public View newView(Context context, Cursor cursor, ViewGroup parent) {
              View ret = mFactory.inflate(R.layout.alarm_time, parent, false);
  
-             ((TextView) ret.findViewById(R.id.am)).setText(mAm);
-             ((TextView) ret.findViewById(R.id.pm)).setText(mPm);
- 
 -            DigitalClock digitalClock = (DigitalClock)ret.findViewById(R.id.digitalClock);
 +            DigitalClock digitalClock =
 +                    (DigitalClock) ret.findViewById(R.id.digitalClock);
              digitalClock.setLive(false);
 -            if (Log.LOGV) Log.v("newView " + cursor.getPosition());
              return ret;
          }