OSDN Git Service

Merge changes Ia4825f54,If6f80560 into eclair
authorAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 15 Nov 2009 13:32:03 +0000 (05:32 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 15 Nov 2009 13:32:03 +0000 (05:32 -0800)
* 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


Trivial merge