OSDN Git Service

am 2eb3900c: resolved conflicts for merge of aafb2fd2 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 19 Oct 2009 20:47:03 +0000 (13:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2009 20:47:03 +0000 (13:47 -0700)
Merge commit '2eb3900c6917520f546f44e4d9ca6f045cffe9ea' into eclair-mr2-plus-aosp

* commit '2eb3900c6917520f546f44e4d9ca6f045cffe9ea':
  Remove the clock face from the alarm list.


Trivial merge