tree 8e69fd60c507da27abf698a46df136a0c11d6d3b
parent c0281048986e41664f4174978a3acd096afd56d7
parent 33bbbb0d333223451eb24d6b462840755fb51152
author Dan Zivkovic <zivkovic@google.com> 1445032939 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445032939 +0000

am 33bbbb0d: am de674ac0: Re-activate emoji keyboard shortcut.

* commit '33bbbb0d333223451eb24d6b462840755fb51152':
  Re-activate emoji keyboard shortcut.