OSDN Git Service

am aeeadc59: resolved conflicts for merge of 1027cd4b to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 29 Oct 2009 12:12:44 +0000 (05:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Oct 2009 12:12:44 +0000 (05:12 -0700)
commit23bc0449490c485f90b280047e4dbced9eb7922b
tree4563f18e133ca50fd7aa0449093298576c40acfa
parentf9ae37b01a1e81d36a985ff24d5e15cd53d8093d
parentaeeadc5989e1f249b3ee60f08ba71fc90bc34b9d
am aeeadc59: resolved conflicts for merge of 1027cd4b to eclair-mr2

Merge commit 'aeeadc5989e1f249b3ee60f08ba71fc90bc34b9d' into eclair-mr2-plus-aosp

* commit 'aeeadc5989e1f249b3ee60f08ba71fc90bc34b9d':
  The snooze notification must be clicked to be cleared.