mozilla-b2g/gaia — pull request #19500 by r-gaia-cs (2014-05-21 20:49:02+00:00)
Title: Bug 993899 - Support Emoticon in keyboard

This add support to emoticon [1] instead of emoji [2].

[1] http://en.wikipedia.org/wiki/Emoticon
[2] http://en.wikipedia.org/wiki/Emoji