[Merge] lp:~phablet-team/ubuntu-system-settings/displayConfiguration into lp:ubuntu-system-settings

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:1582
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~phablet-team/ubuntu-system-settings/displayConfiguration/+merge/281523/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2562/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5915/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5926/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2562/rebuild

-- 
https://code.launchpad.net/~phablet-team/ubuntu-system-settings/displayConfiguration/+merge/281523
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/ubuntu-system-settings/displayConfiguration.