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 '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp

* commit '21390f08138801f9e008917c0c0149839a80d002':
  Adding a feature definition for touchscreens that was overlooked in the last