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