tree 443cf85b251d078f94a69e1eb8f3bfde261f67ea
parent e7075904e84699f2de0e204b56486efebab3a9ce
parent f8e6a7c5ec25f086e383ed0ae1212cac01dee12d
author Romain Guy <romainguy@google.com> 1348532102 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348532102 -0700

Merge "Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476" into jb-mr1-dev