resolved conflicts for merge of e3f01aff to eclair-mr2

diff --cc src/com/android/deskclock/AlarmClock.java
index b37d07a,acf42b3..a619ce7
--- 1/src/com/android/deskclock/AlarmClock.java
--- 2/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@@ -54,14 -56,11 +54,11 @@@ import java.util.Calendar
   */
  public class AlarmClock extends Activity implements OnItemClickListener {
  
 -    final static String PREFERENCES = "AlarmClock";
 +    static final String PREFERENCES = "AlarmClock";
  
-     /** Cap alarm count at this number */
-     static final int MAX_ALARM_COUNT = 12;
- 
      /** This must be false for production.  If true, turns on logging,
          test code, etc. */
 -    final static boolean DEBUG = false;
 +    static final boolean DEBUG = false;
  
      private SharedPreferences mPrefs;
      private LayoutInflater mFactory;