tree 3bbc11c434a0daab781dd90f5398f88e049640b8
parent 429f9177e6b66a07fbc41b4f76fa45a454f72d05
parent dbc2ccff2fb99af1051f0ce73e3c34ebcd69db5f
author Derek Sollenberger <djsollen@google.com> 1338379209 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338379209 -0700

am dbc2ccff: am f37732cf: Merge "detect all masks, and don\'t use masksuperblitter with those." into jb-dev

* commit 'dbc2ccff2fb99af1051f0ce73e3c34ebcd69db5f':
  detect all masks, and don't use masksuperblitter with those.