[Merge] lp:~phablet-team/camera-app/hdr-flash-mutually-exclusive into lp:camera-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/camera-app-ci/350/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/46
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/69
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/342/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/101
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16656
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/281/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/348/artifact/work/output/*zip*/output.zip

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

-- 
https://code.launchpad.net/~phablet-team/camera-app/hdr-flash-mutually-exclusive/+merge/245010
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/camera-app/hdr-flash-mutually-exclusive into lp:camera-app.