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

Browse Source

* 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

parent 6026a95816 16b2dd4396

commit ed7d262eeb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available