OSDN Git Service

am 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair
authorPatrick Scott <phanna@android.com>
Thu, 12 Nov 2009 21:56:18 +0000 (13:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Nov 2009 21:56:18 +0000 (13:56 -0800)
commit9477dee8beaf282a8a2d04ba58651e3bbb0c5cff
treeaab3e2e36674187cd8ec63f1da24860c8d4e468f
parent4cd2958823bdfc5c56344d62b497c14d88b6f07f
parent123538f398bec9e425aee6fd427aa4ad7a11fb28
am 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair

Merge commit '123538f398bec9e425aee6fd427aa4ad7a11fb28' into eclair-mr2-plus-aosp

* commit '123538f398bec9e425aee6fd427aa4ad7a11fb28':
  Cancel the snooze if the user sets an alarm for before the snooze fires.