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

* commit 'da02c479d7aa55b8bcf8cc5db857c761228d2ea4':
This commit is contained in:
Tadashi G. Takaoka 2013-10-03 16:22:35 -07:00 committed by Android Git Automerger
commit 17c82ad559

Diff content is not available