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