Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
tree: cc5a4668557f59aee7d19e6c0323968c8c8ab167
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk