| commit | 25c7690fab11f508b2a4f263ae60d5cac7d59442 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Thu Oct 10 08:38:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 08:38:48 2013 -0700 |
| tree | b1fc435a9383bb3ba54abc2b42a2640abf230bc7 | |
| parent | 561b74acc384bb96ff3d28f8f197494166603213 [diff] | |
| parent | cffaaa56a4df0e70963c61e66bc4362b1a7050c1 [diff] |
am cffaaa56: am 2163a48d: am 302102ee: am db7513bb: am a701501c: Merge "Reduce memory of emoji palette" * commit 'cffaaa56a4df0e70963c61e66bc4362b1a7050c1':