tree 4e48493c6239cdd9b269fbe7a777a53b309843ce
parent c4c61c35a71606501d3ec4beb3df1e517e6da594
parent 628231a4b4de5ab8866faa912309017759efde0a
author Daisuke Miyakawa <dmiyakawa@google.com> 1243525825 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243525825 -0700

am 628231a4: Make libemoji truely optional.

Merge commit '628231a4b4de5ab8866faa912309017759efde0a'

* commit '628231a4b4de5ab8866faa912309017759efde0a':
  Make libemoji truely optional.