am c0f81463: Merge "Add dummy Emoji subtype"

* commit 'c0f81463cb9e60df0289ac8012cbe632dcdfc487':
  Add dummy Emoji subtype
tree: 9450e5b5ec62f7550ab607e4884f992d3250382b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk