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

* commit '605bca9bd0d4e9ca5012a9e8ba7d9c86c3264c1d':
This commit is contained in:
Satoshi Kataoka 2013-10-09 23:54:12 -07:00 committed by Android Git Automerger
commit f647ea4403

Diff content is not available