| commit | ee1ff0da30f7895d38a1d93d1810425dcd04390a | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Fri Oct 11 00:23:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 00:23:38 2013 -0700 |
| tree | 226c0fe56b27c401b490525d02e0398f72239b26 | |
| parent | 85dec741a70bf455d9aae583982580dc79df0209 [diff] | |
| parent | 7611af753af5ba112bcfc8c434caf88dc8f46325 [diff] |
am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev * commit '7611af753af5ba112bcfc8c434caf88dc8f46325': Do not merge. Save / restore the last used emoji category