tree 7e8ac10e2f0fb7e5d921de916b98494a1942e51d
parent 45011f2dc56e99c00bd1f3abff4f11d6df644d80
parent 322591cb4b158dc2edbc3d95cd02e44f132feb5f
author Android (Google) Code Review <android-gerrit@google.com> 1257536362 -0500
committer Android (Google) Code Review <android-gerrit@google.com> 1257536362 -0500

Merge change I6ccd2ebc into eclair

* changes:
  Expose PowerManager.isScreenOn in the public api.