OSDN Git Service

am 5e48334f: am 2eb3900c: resolved conflicts for merge of aafb2fd2 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 19 Oct 2009 20:52:44 +0000 (13:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2009 20:52:44 +0000 (13:52 -0700)
Merge commit '5e48334ff203cba18d70197f95648e860b27d21d'

* commit '5e48334ff203cba18d70197f95648e860b27d21d':
  Remove the clock face from the alarm list.


Trivial merge