Mike Lockwood c015130050 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.

2009-09-19 21:33:32 -07:00

..

com/android/server

am b8155068: Merge change 25944 into eclair

2009-09-19 21:33:32 -07:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00