| commit | ff82b5fee1d2bb187dc7422885b7da68e49fbb14 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Fri Oct 11 00:27:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 00:27:56 2013 -0700 |
| tree | 4768324434177655da3e7eb0f95e6ef6d52dee4d | |
| parent | c16be0237eb213ea473d985a2f61f89264126102 [diff] | |
| parent | ed7d262eeb86b1f336ca9b79db072aa53ac956fb [diff] |
am ed7d262e: (-s ours) am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev * commit 'ed7d262eeb86b1f336ca9b79db072aa53ac956fb': Do not merge. Save / restore the last used emoji category