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