Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-mr2 * commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404': Fix a race condition that resulted in the screen coming on without the brightness set to the correct value. PowerManagerService: Hold a wakelock while mProximityTask is queued