am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev

* commit '16b2dd439634e469edcfbd9b876be6288014df58':
  Do not merge. Save / restore the last used emoji category
This commit is contained in:
Satoshi Kataoka 2013-10-11 00:26:25 -07:00 committed by Android Git Automerger
commit ed7d262eeb

Diff content is not available