[Merge] lp:~phablet-team/camera-app/fix-failing-tests into lp:camera-app

[Olivier Tilloy]

The proposal to merge lp:~phablet-team/camera-app/fix-failing-tests into lp:camera-app has been updated.

Commit Message changed to:

Fix some failing tests (that were failing for real test bugs, not due to infrastructure problems).

For more details, see:
https://code.launchpad.net/~phablet-team/camera-app/fix-failing-tests/+merge/250054
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/camera-app/fix-failing-tests into lp:camera-app.