tree 678afdd597e739067c698a322e6f7a24228a6b96
parent 3ce589e59507193ce15a76fa135bf2efc7bca7c6
parent 0575b185c618a79ede771389ed9a78436b5636bd
author Jeff Brown <jeffbrown@google.com> 1394651952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394651952 +0000

am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev

* commit '0575b185c618a79ede771389ed9a78436b5636bd':
  Add a temporary hack to report screen on while dozing.