tree 02861c4660c46bdd3fb5afbd5887426da1f7111e
parent 734d270769c609c7d3a1f2ec46e1d329d9682ab4
parent 8d60866e2100db70ecf0502c14768a384514d7e9
author Jeff Brown <jeffbrown@google.com> 1283217752 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283217752 -0700

am 8d60866e: Input device calibration and capabilities.

Merge commit '8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp

* commit '8d60866e2100db70ecf0502c14768a384514d7e9':
  Input device calibration and capabilities.