Mike Lockwood fb8910f958 am 6391830d: Merge change 22958 into eclair ...

Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp

* commit '6391830d103ccb19465c69660065c22c2711dcfd':
  Don't activate keyguard if screen is turned off while proximity sensor is active.

2009-08-27 14:32:55 -07:00

..

java

am 6391830d: Merge change 22958 into eclair

2009-08-27 14:32:55 -07:00

jni

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

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