am 7fbda5f0: am cc38bfb5: Merge "Add emoji icon and code as a groundwork"

* commit '7fbda5f0472e8ddb5b6609ab9f1f8052aaf27f00':
main
Tadashi G. Takaoka 2013-09-26 05:56:22 -07:00 committed by Android Git Automerger
commit 555d8899a4

Diff Content Not Available