diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-15 05:35:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-15 05:35:35 -0800 |
| commit | 0947498bbc67fd202660a8565000b35bd7e8ee22 (patch) | |
| tree | 477ff433e2543df2d1b5eb7f6cdc8b6fdf404fd7 | |
| parent | 500c8cc3edffa7140f1db49bd3a12a06fe234a63 (diff) | |
| parent | f3b6793f8e9aec359ab78aa516343d7d9c2c645b (diff) | |
| download | frameworks_native-0947498bbc67fd202660a8565000b35bd7e8ee22.zip frameworks_native-0947498bbc67fd202660a8565000b35bd7e8ee22.tar.gz frameworks_native-0947498bbc67fd202660a8565000b35bd7e8ee22.tar.bz2 | |
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
0 files changed, 0 insertions, 0 deletions