tree 7a4596b40813f396f3c3cac5722f081db9851de2
parent 7df6893db541158904cfdbb2760c9080ad3f2579
parent 49ea5b5e305f4185e9f13c5022260250b3c23b27
author Scott Anderson <saa@android.com> 1345143853 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345143853 -0700

am 49ea5b5e: Merge "Add uhid original header." into jb-mr1-dev

* commit '49ea5b5e305f4185e9f13c5022260250b3c23b27':
  Add uhid original header.