am f647ea44: am 605bca9b: am f12df9e4: am 3bf2c598: am 1d188a28: Merge "Fix emoji"

* commit 'f647ea44039440fdc6556faaf047f1ab210b6afb':
This commit is contained in:
Satoshi Kataoka 2013-10-10 08:31:17 -07:00 committed by Android Git Automerger
commit 82d7886f51

Diff content is not available