mozilla-b2g/gaia — pull request #18855 by wilsonpage (2014-05-01 09:45:05+00:00)
Title: Bug 999171 - Implement a progress indicator to show progress when the

viewfinder has not loaded

Conflicts:
apps/camera/js/app.js
apps/camera/js/config/config.js
apps/camera/js/controllers/controls.js
apps/camera/test/unit/app_test.js