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

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/camera-app-ci/315/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/221
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/43
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16187
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/225
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/225/artifact/work/output/*zip*/output.zip

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

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