OSDN Git Service

am bafd4638: Merge change Ic7edd6ea into eclair
authorPatrick Scott <phanna@android.com>
Thu, 12 Nov 2009 13:44:44 +0000 (05:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Nov 2009 13:44:44 +0000 (05:44 -0800)
Merge commit 'bafd4638a5f7f5ea1663e13caee2e1e7ae7e75c9' into eclair-plus-aosp

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


Trivial merge