Merge "Add dummy Emoji subtype"
tree: 9a01e1169fbcdc6ca24449d6ef705d0eb87364e8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk