[Merge] lp:~phablet-team/camera-app/photo-editor into lp:camera-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/camera-app-ci/348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/44
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/703/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/94
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16576
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/266/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/323
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/323/artifact/work/output/*zip*/output.zip

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

-- 
https://code.launchpad.net/~phablet-team/camera-app/photo-editor/+merge/242696
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.