From: Daniel Sandler <dsandler@google.com>
Date: Mon, 7 Dec 2009 22:30:26 +0000 (-0800)
Subject: am a5db0f5f: (-s ours) am 801fd314: am c1d449d0: (-s ours) Fix http://b/2305223 ... 
X-Git-Tag: android-x86-2.2~63
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af4c3b4b77994a7b78588de8edd94526a6b316d9;hp=a5db0f5f3540ed93caa816a854646b67a81cc28d;p=android-x86%2Fpackages-apps-DeskClock.git

am a5db0f5f: (-s ours) am 801fd314: am c1d449d0: (-s ours) Fix b/2305223 (DO NOT MERGE)

Merge commit 'a5db0f5f3540ed93caa816a854646b67a81cc28d'

* commit 'a5db0f5f3540ed93caa816a854646b67a81cc28d':
  Fix http://b/2305223 (DO NOT MERGE)
---