Bug 1001817 - [email] remove unused localization strings from Firefox OS 2.0
Bug 985237 - Disable failing test, keyboard/test/unit/jspinyin_test.js | jspinyin deactivate
Merge pull request #18869 from KevinGrandon/bug_985237_disable_failing_pinyin_test

Bug 985237 - Disable failing test, keyboard/test/unit/jspinyin_test.js | jspinyin deactivate
Merge pull request #18707 from Archaeopteryx/email-stringRemoval

Bug 1001817 - [email] remove unused localization strings from Firefox OS 2.0. r=jrburke, r=asuth