am 0a12b8e5: am 4d12d5be: Merge "Recover from bad input event timestamps from...
am 0a12b8e5: am 4d12d5be: Merge "Recover from bad input event timestamps from the kernel." into jb-mr1-dev
* commit '0a12b8e5':
Recover from bad input event timestamps from the kernel.