tree ed855078c90054b870b6effb1b1ea9f82f1fb200
parent e2c394f4f05602899b50f39a439c115ed15fbb46
parent 2243017061d3cfdfa6c18d9e2ce2a618c6db470d
author Dan Morrill <morrildl@google.com> 1273002898 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273002898 -0700

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