OSDN Git Service

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

* commit '7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7':
  New UI for the list of alarms.


Trivial merge