diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-15 14:49:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-15 14:49:40 -0800 |
| commit | 7f9fb0c4de7b9c8e9e33260d64844aad8a075609 (patch) | |
| tree | 7beafcb3f655e40f9287ae870c88d5655665cdbf /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2 (diff) | |
| parent | 04c585e3bcb75c85ceeacf2fd94ea4194f332404 (diff) | |
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
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions