tree 19c9624e6e4cda73a4491a7795f5d6da68abf944
parent de69575dd1bdafabda8afda8b4251b830ba0c551
parent 81cc19cf18dff969319c7d1ded4f285394e37aab
author Jeff Brown <jeffbrown@google.com> 1394665072 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394665072 +0000

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

* commit '81cc19cf18dff969319c7d1ded4f285394e37aab':
  Add a temporary hack to report screen on while dozing.