Skip to content
Commit 04c585e3 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge changes Ia4825f54,If6f80560 into eclair 

* changes:
  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
parents 383aa124 e0902814
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment