tree dd8096b4c862944e3bc4ef49a48f01c47fdf7707
parent 7174fcf6031234bfc9aa29bf3085d14742cab944
parent 5fd01f7aff5bf3e835ce233b68199db19ac93c1d
author Mike Lockwood <lockwood@android.com> 1258411023 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258411023 -0800

am 5fd01f7a: am fa82d97d: Merge change Ib1fb3fcf into eclair

Merge commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d' into eclair-mr2-plus-aosp

* commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d':
  Keep screen bright until boot completed.