am 1d03c2d6: (-s ours) 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 '1d03c2d6f686d8ac5446da99a218ed64a6da1e4f':
  Do not merge. Don't show long-pressing emoji key on tablet
main
Satoshi Kataoka 2013-10-17 17:51:00 -07:00 committed by Android Git Automerger
commit ae2c85e523

Diff Content Not Available