am 69998fe8: (-s ours) am dcc33ab0: am 141a0c33: Merge "Do not merge. Don\'t show long-pressing emoji key on tablet" into klp-dev

* commit '69998fe895178793c429a7786288faad5fa2fc10':
  Do not merge. Don't show long-pressing emoji key on tablet
This commit is contained in:
Satoshi Kataoka 2013-10-17 17:49:26 -07:00 committed by Android Git Automerger
commit 1d03c2d6f6

Diff content is not available