| commit | 1a5e6a7446fdaa8f8913b151ed6d1f70f74c939b | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Wed Oct 09 21:26:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 21:26:45 2013 -0700 |
| tree | b0410d9a4a8ed276abe6ea68d3750818d603c16e | |
| parent | 5e70e91e2c565cce2628143a0dc630e080d0f576 [diff] | |
| parent | 6deea22cf1957cc2bb90eec762e0752aba194ad7 [diff] |
am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette" * commit '6deea22cf1957cc2bb90eec762e0752aba194ad7': Fix the position of emoji palette