am 15f92304: am 85fa07b1: am b49dba68: am c0f81463: Merge "Add dummy Emoji subtype"

* commit '15f92304a91212ec98b0ad266cc4f6b1ad0f8e43':
This commit is contained in:
Tadashi G. Takaoka 2013-10-03 12:09:53 -07:00 committed by Android Git Automerger
commit b1fdedf80a

Diff content is not available