am e77fc97d: Tiny fix in EmojiFactory.cpp This must be submitted with change 2432.

Merge commit 'e77fc97dc6438110fd5205db2b5c5b799014a0b9'

* commit 'e77fc97dc6438110fd5205db2b5c5b799014a0b9':
  Tiny fix in EmojiFactory.cpp
tree: b2ca1b6b0c03fc3a3c0733ee021fbec869154240
  1. Android.mk
  2. EmojiFactory.cpp
  3. EmojiFactory.h