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