am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev

* commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4':
  Fix a bug where emojis would remove the suggestion strip.
tree: 64b97124902638880b381ffe10518789c8cf25c2
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk