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

* commit '8439fafa2cc9199ccb6d0a25374e7ec47cd0f45d':
This commit is contained in:
Tadashi G. Takaoka 2013-10-03 15:16:31 -07:00 committed by Android Git Automerger
commit da02c479d7

Diff content is not available