OSDN Git Service

am 44c3bfe2: am a405d7d1: Merge change I0a8adab9 into eclair
authorDaniel Sandler <dsandler@google.com>
Wed, 2 Dec 2009 20:08:29 +0000 (12:08 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 20:08:29 +0000 (12:08 -0800)
commitaa4d5e67ca394fe89f2bc9cbccceb76dca0116ca
tree2985f83aabcdd021953ed946b84f17a4ded342a2
parent4e57979295d06d398fabdd3e02351bf87c377d67
parent44c3bfe294da8063f817c80b1f311e101a220b09
am 44c3bfe2: am a405d7d1: Merge change I0a8adab9 into eclair

Merge commit '44c3bfe294da8063f817c80b1f311e101a220b09' into eclair-mr2-plus-aosp

* commit '44c3bfe294da8063f817c80b1f311e101a220b09':
  Reduce screen saver delay to 5 min.