| commit | ad0a6de49fa1a98952720ef286c9f7a1b19087d1 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Sun Nov 15 14:49:40 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 15 14:49:40 2009 -0800 |
| tree | 2be5aacbe410439b4a1d5ce6fff5c769c2e6680c | |
| parent | dbc4a919b8213bc91db4af6ae0637ddc72775d90 [diff] | |
| parent | f3b6793f8e9aec359ab78aa516343d7d9c2c645b [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