am 21390f08: Merge "Adding a feature definition for touchscreens that was...
am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit '21390f08' into froyo-plus-aosp
* commit '21390f08':
Adding a feature definition for touchscreens that was overlooked in the last