| commit | ed7d262eeb86b1f336ca9b79db072aa53ac956fb | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Fri Oct 11 00:26:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 00:26:25 2013 -0700 |
| tree | 0f71cc52599287e7ffa839c1cc3df77c1c7f601e | |
| parent | 6026a9581685b2d91fc5bd6cf33a506d5560c238 [diff] | |
| parent | 16b2dd439634e469edcfbd9b876be6288014df58 [diff] |
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