[Merge] lp:~phablet-team/camera-app/disk-space-monitor into lp:camera-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:492
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/camera-app/disk-space-monitor/+merge/247528/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/camera-app-ci/364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/737/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/193
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17424
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/545/console

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

-- 
https://code.launchpad.net/~phablet-team/camera-app/disk-space-monitor/+merge/247528
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/camera-app/disk-space-monitor into lp:camera-app.