OSDN Git Service

am 9477dee8: am 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair
authorPatrick Scott <phanna@android.com>
Thu, 12 Nov 2009 21:58:22 +0000 (13:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Nov 2009 21:58:22 +0000 (13:58 -0800)
commita1e4e928dba9b8b7b68a6c71f7f12744a70eeeb8
treeaab3e2e36674187cd8ec63f1da24860c8d4e468f
parent29b710bd5f64981a3c1272784c4f40f57846a311
parent9477dee8beaf282a8a2d04ba58651e3bbb0c5cff
am 9477dee8: am 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair

Merge commit '9477dee8beaf282a8a2d04ba58651e3bbb0c5cff'

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