am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair
Merge commit '04c585e3' into eclair-mr2
* commit '04c585e3':
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