mozilla-b2g/gaia — pull request #20175 by davidflanagan (2014-06-06 23:56:25+00:00)
Title: Merge pull request #19409 from dmarcos/bug995540

Bug 995540 - [Sora][camera]video recording would not stop instantly when...(cherry picked from commit 93623f6435849cc9f54d9996e8e64828ac9091d1)

Conflicts:

apps/camera/js/app.js
apps/camera/js/controllers/camera.js
apps/system/js/attention_screen.js