OSDN Git Service

am f6f1e5d2: resolved conflicts for merge of e3f01aff to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 16 Nov 2009 22:41:39 +0000 (14:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Nov 2009 22:41:39 +0000 (14:41 -0800)
Merge commit 'f6f1e5d224b8522d6f62ece1dff4180b381f2a47' into eclair-mr2-plus-aosp

* commit 'f6f1e5d224b8522d6f62ece1dff4180b381f2a47':
  Finish the UI improvements for the alarm list.


Trivial merge