Merge commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp * commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117': Refactor input reader to support new device types more easily.
Merge commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp * commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117': Refactor input reader to support new device types more easily.