From: Patrick Scott <phanna@android.com>
Date: Wed, 2 Dec 2009 13:24:28 +0000 (-0800)
Subject: am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2
X-Git-Tag: android-x86-2.2~70^2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-DeskClock.git;a=commitdiff_plain;h=49d9aef1f4054aa9d6f4d69b850285cccaef9428

am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2

Merge commit 'c3f77cc16633551c4daf1c160f4655762dda9a3b' into eclair-mr2-plus-aosp

* commit 'c3f77cc16633551c4daf1c160f4655762dda9a3b':
  UI changes based on feedback from Jeff and Amar.
---

49d9aef1f4054aa9d6f4d69b850285cccaef9428