]> git.saurik.com Git - android/aapt.git/commitdiff
am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics...
authorDan Morrill <morrildl@google.com>
Tue, 4 May 2010 19:45:49 +0000 (12:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 May 2010 19:45:49 +0000 (12:45 -0700)
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

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


Trivial merge