mozilla-b2g/gaia — pull request #12947 by davidflanagan (2013-10-18 22:17:40+00:00)
Title: Merge pull request #12322 from davidflanagan/autocorrect-config

Bug 884752: configure keyboard layouts and dictionaries at build time r=janjongboom,luke-chang,aus(cherry picked from commit 38456b0b9ee903e597d2a2fd949c10fd673e1993)

Conflicts:

Makefile
apps/keyboard/js/keyboard.js