Mike Lockwood d9a49b00ce Fix broken merges from MR2: ...

e090281428 Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
0e5bb7f1c9 PowerManagerService: Hold a wakelock while mProximityTask is queued

Change-Id: I8082b546467f839f53187534bb4264e59bd4a7db
Signed-off-by: Mike Lockwood <lockwood@android.com>

2009-11-19 01:44:58 -05:00

..

com/android/server

Fix broken merges from MR2:

2009-11-19 01:44:58 -05:00

Android.mk

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

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