Merge "Fix emoji"
tree: 77657e6485fb88f449d255b849e96889c08297d8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk