tree bc3a1a5416a8bc6579423850eb9ed165dfb18fae
parent 091b78c2030d77bc9ae3fb8d692efa2efe31b3f8
parent 9dacf7ee76a54333c0774eb8c870a3d8b2ef6c5d
author David 'Digit' Turner <digit@android.com> 1300716657 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300716657 -0700

am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."

* commit '9dacf7ee76a54333c0774eb8c870a3d8b2ef6c5d':
  Fix two incorrect <android/input.h> function declarations.