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

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:592
http://jenkins.qa.ubuntu.com/job/camera-app-ci/457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/153
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/311
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/812
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25247

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

-- 
https://code.launchpad.net/~fboucault/camera-app/resolution_options/+merge/274402
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~fboucault/camera-app/resolution_options into lp:camera-app.