[Merge] lp:~fboucault/camera-app/always_check_resolution_is_option into lp:camera-app/staging

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/27/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/393
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/954
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27199

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

-- 
https://code.launchpad.net/~fboucault/camera-app/always_check_resolution_is_option/+merge/284608
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app/staging.