tree 8522b5aed18e67ea652cdaacc9bcebf78db92b3b
parent da5a0dc71129044cc5a44cca1780855baa4181e8
parent 7e4186accea094276c9f3c65c64e63ffc59aa644
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1429540162 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1429540162 +0000

Merge "add GM to test imagefilters + xfermodes" into master-skia

https://skia.googlesource.com/skia/+/7e4186accea094276c9f3c65c64e63ffc59aa644

Change-Id: I444d511cfc6b88a9e5f3d0bdcc40adb7e7e8dce5