OSDN Git Service

am 6142aa5a: am 7e344f5d: resolved conflicts for merge of 4e1b06eb to eclair-mr2
authorPatrick Scott <phanna@android.com>
Tue, 17 Nov 2009 15:31:53 +0000 (07:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Nov 2009 15:31:53 +0000 (07:31 -0800)
Merge commit '6142aa5a0e025d65b6a4d152e1570b31e0991c5c'

* commit '6142aa5a0e025d65b6a4d152e1570b31e0991c5c':
  New UI for the list of alarms.


Trivial merge