Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
tree: b62aa7d16cf9e6ae67fbf5f7addce043f71867c9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk