tree 1161bd34c59e806ec4412e13c63296e48945aa18
parent ca3a6dc41418da152d154245c59054f7d0f0d679
parent 3cba72880b78b81cda2868136462c9e261a3e403
author Charles Mendis <cmendis@google.com> 1257536803 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257536803 -0800

am 3cba7288: Merge change I6ccd2ebc into eclair

Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.