tree dafa1fb3a2c8afdc03fd3d313b6c520af2addd5d
parent f271fa33f148b0c410e8ee06aceb1f2b57cd62c7
parent c0c395162ff14b83694158663470ad60e065d9a9
author Joe LaPenna <jlapenna@google.com> 1424738808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424738808 +0000

am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev

* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.