tree d9bbff25bcf8d37bcded5ee45941a10f1e8337a7
parent 4c45b649c36d6c28d22a98d979fbda3b7c36677a
parent 606e4e8c98304daf756f7e89d47005573288f72a
author Jeff Brown <jeffbrown@google.com> 1411175331 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411175332 +0000

Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev