tree 6bb439e7b3c2b8c32a10a4b71cd8220045a49a90
parent 5193a5bab165a4f812b8e72d656b6a18ee04f42b
parent 9795a25da060f9a7df87da8ab43fb1086d4322a5
author Jeff Brown <jeffbrown@google.com> 1280352475 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280352475 -0700

am 9795a25d: am 6d0fec2d: Refactor input reader to support new device types more easily.

Merge commit '9795a25da060f9a7df87da8ab43fb1086d4322a5'

* commit '9795a25da060f9a7df87da8ab43fb1086d4322a5':
  Refactor input reader to support new device types more easily.