am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"

* commit '1a5e6a7446fdaa8f8913b151ed6d1f70f74c939b':
main
Satoshi Kataoka 2013-10-10 08:23:44 -07:00 committed by Android Git Automerger
commit ab581457ae

Diff Content Not Available