[Merge] lp:~jhodapp/camera-app/reenable-video-recording into lp:camera-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/camera-app-ci/202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/99
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/138
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8582
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1040
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1040/artifact/work/output/*zip*/output.zip

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

-- 
https://code.launchpad.net/~jhodapp/camera-app/reenable-video-recording/+merge/223578
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~jhodapp/camera-app/reenable-video-recording into lp:camera-app.