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

* commit '07b54d63e5027b68f74ad6686cb3ab552d7d2a9a':
main
Tadashi G. Takaoka 2013-10-03 11:55:50 -07:00 committed by Android Git Automerger
commit 8439fafa2c

Diff Content Not Available