Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev

diff --cc api/current.txt
index 0418cd9,cf50a70..ccd06f7
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -19392,7 -19392,9 +19392,8 @@@ package android.provider 
      ctor public AlarmClock();
      field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";
      field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";
+     field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS";
      field public static final java.lang.String EXTRA_DAYS = "android.intent.extra.alarm.DAYS";
 -    field public static final java.lang.String EXTRA_DELETE_AFTER_USE = "android.intent.extra.alarm.DELETE_AFTER_USE";
      field public static final java.lang.String EXTRA_HOUR = "android.intent.extra.alarm.HOUR";
      field public static final java.lang.String EXTRA_LENGTH = "android.intent.extra.alarm.LENGTH";
      field public static final java.lang.String EXTRA_MESSAGE = "android.intent.extra.alarm.MESSAGE";

diff --cc core/java/android/provider/AlarmClock.java
Simple merge