am 6026a958: Merge "Save / restore the last used emoji category"

* commit '6026a9581685b2d91fc5bd6cf33a506d5560c238':
  Save / restore the last used emoji category
tree: 4768324434177655da3e7eb0f95e6ef6d52dee4d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk