mozilla-b2g/gaia — pull request #10000 by mcirlanaru (2013-05-25 10:54:21+00:00)
Title: Merge pull request #9724 from mcirlanaru/bug_868001

Bug 868001 - [Keyboard] Accommodate non-latin layouts, r=@fcampo(cherry picked from commit f14df69587b597c6a1d9aa0865fe468d328c5c56)

Conflicts:

apps/communications/ftu/js/language.js
apps/communications/ftu/test/unit/language_test.js
apps/settings/js/settings.js
shared/resources/keyboard_layouts.json