tree 2a21fa8332f5f0185583ba96810cc951a428c891
parent 23886803a13f5f8f9c69fd6374ca1f732d1e513b
parent f7104136927f45e152cec3583463b8ef1570df7b
author Michael Wright <michaelwr@google.com> 1365628807 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365628807 -0700

am f7104136: Merge "Stop marking gamepads as keyboards" into jb-mr2-dev

* commit 'f7104136927f45e152cec3583463b8ef1570df7b':
  Stop marking gamepads as keyboards