From: Dan Morrill <morrildl@google.com>
Date: Tue, 4 May 2010 19:45:49 +0000 (-0700)
Subject: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/e8b1d1095bd7c2b3d0fb6c0ffa3e27f8ad54a74b

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

Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device
---

e8b1d1095bd7c2b3d0fb6c0ffa3e27f8ad54a74b