Mike Lockwood 569e114aa7 am 25b9cec8: Merge change 22692 into eclair ...

Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp

* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
  PowerManagerService: Disallow all user activity when in proximity wake lock.

2009-08-27 11:28:53 -07:00

..

java

am 25b9cec8: Merge change 22692 into eclair

2009-08-27 11:28:53 -07:00

jni

BatteryService: Add support for new standard battery voltage and temperature attributes.

2009-08-17 19:58:32 -04:00