commit | e5e2916c7e57aa6cf1ff076c331fe79fe9ec1873 | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@android.com> | Sun Nov 15 05:35:35 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 15 05:35:35 2009 -0800 |
tree | a6f0b6f47429934abaccdea782e79c02be236c41 | |
parent | 834b1e701624124c61ed2eddff83001577a9f719 [diff] | |
parent | 04c585e3bcb75c85ceeacf2fd94ea4194f332404 [diff] |
am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-plus-aosp * 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