[Merge] lp:~mterry/powerd/no-screen-on into lp:powerd

[PS Jenkins bot]

Review: Approve continuous-integration

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/powerd-ci/188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/188/rebuild

-- 
https://code.launchpad.net/~mterry/powerd/no-screen-on/+merge/271705
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~mterry/powerd/no-screen-on into lp:powerd.