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

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:602
http://jenkins.qa.ubuntu.com/job/camera-app-ci/475/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/171
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/171
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/334
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/840
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25499

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

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