mozilla-b2g/gaia — pull request #17314 by yurenju (2014-03-19 08:16:54+00:00)
Title: Bug 920431 - [keyboard] keyboard_layout.json should be customizable

Conflicts:
build/settings.js
build/test/integration/distribution.test.js
build/webapp-manifests.js