OSDN Git Service

am 7e65cf26: am f6f1e5d2: resolved conflicts for merge of e3f01aff to eclair-mr2
authorPatrick Scott <phanna@android.com>
Tue, 17 Nov 2009 15:32:00 +0000 (07:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Nov 2009 15:32:00 +0000 (07:32 -0800)
commitcc41f7c86d16243dd85a0562199fbe7468156f78
treeb512df8207453ca7f9c743e5b24cc817f804ad00
parentd2c83b4d004292602f4f78b1d412bada6a901bd7
parent7e65cf26fd707dcf733b4d1efaec99882b0cf0d8
am 7e65cf26: am f6f1e5d2: resolved conflicts for merge of e3f01aff to eclair-mr2

Merge commit '7e65cf26fd707dcf733b4d1efaec99882b0cf0d8'

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