tree 8b481771419df96837e22288b9297907edd4f106
parent 7d7257dd9cbe38453678f2803032e283a0344424
parent 991475a2e5dcb344299387521b52fb637d6b1e4d
author Mike Lockwood <lockwood@android.com> 1258154505 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258154505 -0800

am 991475a2: Merge change I0e419fcf into eclair

Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2

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