OSDN Git Service

am b8155068: Merge change 25944 into eclair
authorMike Lockwood <lockwood@android.com>
Sun, 20 Sep 2009 04:33:32 +0000 (21:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 20 Sep 2009 04:33:32 +0000 (21:33 -0700)
commitc01513005085fd4a1e3c7183348cd22e4ac214f3
tree03495bfc0a63c6eac9cd732b0950ed549d697d12
parentc70f90b484af17393986ff2a948f56575580c272
parentb8155068ef855147d86465817be2660a5212a6bb
am b8155068: Merge change 25944 into eclair

Merge commit 'b8155068ef855147d86465817be2660a5212a6bb' into eclair-plus-aosp

* commit 'b8155068ef855147d86465817be2660a5212a6bb':
  Wake the screen if the proximity wakelock is released while the proximity sensor is active.