commit | 00a3441b259451befaa3282be6d3db215be57d22 | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Sat Sep 20 02:04:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 02:04:55 2014 +0000 |
tree | 796d2a95ee8e67df9ba9477b4fd4630a09624758 | |
parent | 688c88e0d27718bec51ab306f30eb89176001949 [diff] | |
parent | 044af2d4f52262d8d0fa69d900cc019d5b9e9632 [diff] |
am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev * commit '5737f7d75c34b2cb7c66771d3cda21a019acd2d2': Ensure that the screen on blocker is applied while dozing.