tree 528b38d080a04d358c05c54592a4faff87ea66eb
parent cbc13f057f8cf6d2fda86d661117d8df3e03c40e
parent 37e5ceac65021f434324de6e80a223071223a206
author Deepanshu Gupta <deepanshu@google.com> 1404325176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404325176 +0000

am c91ee2f9: Merge "Add nameID 4 to AndroidEmoji" into lmp-preview-dev

* commit 'c91ee2f9f42e6e443fec231d5090c9557af8be68':
  Add nameID 4 to AndroidEmoji