am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for...
am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit 'e17b4e71' into froyo-plus-aosp
* commit 'e17b4e71':
Adding the backward-compatible filtering heuristics for the new device