tree 7beafcb3f655e40f9287ae870c88d5655665cdbf
parent fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2
parent 04c585e3bcb75c85ceeacf2fd94ea4194f332404
author Mike Lockwood <lockwood@android.com> 1258325380 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258325380 -0800

am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair

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