From: Daniel Sandler <dsandler@google.com>
Date: Fri, 6 Nov 2009 04:47:53 +0000 (-0800)
Subject: am 0f4f921c: am 35cc835f: am ff1c25c3: Merge change I7ea1d183 into eclair
X-Git-Tag: android-x86-2.2~97
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=11e4be2db2e9001f4c146345c500f87c0d0020b2;p=android-x86%2Fpackages-apps-DeskClock.git

am 0f4f921c: am 35cc835f: am ff1c25c3: Merge change I7ea1d183 into eclair

Merge commit '0f4f921c0b282bcffa6198c0f3614ead7fab5da3'

* commit '0f4f921c0b282bcffa6198c0f3614ead7fab5da3':
  Alarm Clock is now simply Clock.
---

11e4be2db2e9001f4c146345c500f87c0d0020b2