[Merge] lp:camera-app/staging into lp:camera-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:656
http://jenkins.qa.ubuntu.com/job/camera-app-ci/486/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/182/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/181/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/416
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1011
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27902

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

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