From: Daniel Sandler <dsandler@google.com>
Date: Wed, 2 Dec 2009 20:05:38 +0000 (-0800)
Subject: am a405d7d1: Merge change I0a8adab9 into eclair
X-Git-Tag: android-x86-2.2~36^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5d6c88a1ec5d77e584338f7a205d8807bca4b07;p=android-x86%2Fpackages-apps-DeskClock.git

am a405d7d1: Merge change I0a8adab9 into eclair

Merge commit 'a405d7d18cbc7a572a9fbde729bb4182a07c830f' into eclair-plus-aosp

* commit 'a405d7d18cbc7a572a9fbde729bb4182a07c830f':
  Reduce screen saver delay to 5 min.
---

e5d6c88a1ec5d77e584338f7a205d8807bca4b07