From: Mike Lockwood <lockwood@android.com>
Date: Thu, 3 Dec 2009 19:09:10 +0000 (-0800)
Subject: am db0ec648: Merge change I85572973 into eclair
X-Git-Tag: android-x86-2.2~14^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2fa3bf06b19cdb5aa2040de6c16c055a34810cbf;p=android-x86%2Fframeworks-policies-base.git

am db0ec648: Merge change I85572973 into eclair

Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-plus-aosp

* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
  Do not show keyguard if screen is turned off by proximity sensor.
---

2fa3bf06b19cdb5aa2040de6c16c055a34810cbf