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

* commit '555d8899a4b6f9d50f9216ba0305818ea511326e':
main
Tadashi G. Takaoka 2013-09-26 07:41:41 -07:00 committed by Android Git Automerger
commit 07b54d63e5

Diff Content Not Available