tree 5a2b4e77654a0897408f04e429045e49359a0e4b
parent cd5e3f85fc9228b943ee8dfda0951e068953596c
parent f24687e2731811fd0e3803b691fd47a659f89329
author Jeff Brown <jeffbrown@google.com> 1397188177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397188177 +0000

am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev

* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.