am 137572f0: am 8e3a90e5: Merge "Add emoji keyboard related assets"

* commit '137572f00696d442c62df8250a791ed50c096fca':
main
Tadashi G. Takaoka 2013-09-26 06:02:54 -07:00 committed by Android Git Automerger
commit cf3b865cd8

Diff Content Not Available