| commit | cffaaa56a4df0e70963c61e66bc4362b1a7050c1 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Thu Oct 10 08:23:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 08:23:34 2013 -0700 |
| tree | 12a3e9141ce5abddead7b5b7fb9db01153db6175 | |
| parent | ca237747fba58dd3b90517eaf1165995e102deef [diff] | |
| parent | 2163a48d860dffb0dd97473a086586ea1781f48c [diff] |
am 2163a48d: am 302102ee: am db7513bb: am a701501c: Merge "Reduce memory of emoji palette" * commit '2163a48d860dffb0dd97473a086586ea1781f48c':