[Merge] lp:~tiagosh/messaging-app/messaging-settings-page into lp:messaging-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2920
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2920/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20704

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/587/rebuild

-- 
https://code.launchpad.net/~tiagosh/messaging-app/messaging-settings-page/+merge/257832
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~tiagosh/messaging-app/messaging-settings-page into lp:messaging-app.