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

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/camera-app-ci/448/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/144/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/295
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/780
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24901

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/448/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.