tree 8e69fd60c507da27abf698a46df136a0c11d6d3b
parent e8e27b0bd73d7b7bdfc52daecbf359ab8e951c3f
parent de674ac02ee0090078f1ec0d286f26ef19cdeebb
author Dan Zivkovic <zivkovic@google.com> 1445032567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445032567 +0000

am de674ac0: Re-activate emoji keyboard shortcut.

* commit 'de674ac02ee0090078f1ec0d286f26ef19cdeebb':
  Re-activate emoji keyboard shortcut.