tree 1a5baea26f86a7b4f9bff2df837de48e97aff312
parent 3f78cb428eb51c8813ccbfaa4716682a0e41537e
parent 7b197ea1107055bcdf0a15f285495c5d70a3555c
author Michael Wright <michaelwr@google.com> 1376513298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376513298 -0700

am 7b197ea1: am 5e4a2f31: Merge "Update kernel input headers"

* commit '7b197ea1107055bcdf0a15f285495c5d70a3555c':
  Update kernel input headers