tree 678d993d3cfe886f4d623751ac8d75ca1fdc0d11
parent d35f0bc917a378e9233d293075edde56ce1a3b78
parent 991475a2e5dcb344299387521b52fb637d6b1e4d
author Mike Lockwood <lockwood@android.com> 1258154436 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258154436 -0800

am 991475a2: Merge change I0e419fcf into eclair

Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp

* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager