am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair

Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp

* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
  Expose PowerManager.isScreenOn in the public api.