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

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/camera-app-ci/382/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/607/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/308
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17989
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/717/console

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

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