mozilla-b2g/gaia — pull request #17494 by gasolin (2014-03-24 01:49:21+00:00)
Title: Bug 971554 - [System2] Instantiable SoundManager

Conflicts:
apps/system/js/bootstrap.js

Conflicts:
apps/system/test/unit/bootstrap_test.js
build/jshint/xfail.list