OSDN Git Service

am bafd4638: Merge change Ic7edd6ea into eclair
authorPatrick Scott <phanna@android.com>
Thu, 12 Nov 2009 13:44:51 +0000 (05:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Nov 2009 13:44:51 +0000 (05:44 -0800)
commit123538f398bec9e425aee6fd427aa4ad7a11fb28
treeaab3e2e36674187cd8ec63f1da24860c8d4e468f
parentcbf6f5e39b17a84beb93876d95594c26784b8128
parentbafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9
am bafd4638: Merge change Ic7edd6ea into eclair

Merge commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9' into eclair-mr2

* commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9':
  Cancel the snooze if the user sets an alarm for before the snooze fires.
src/com/android/deskclock/SetAlarm.java