| commit | 079b47117cd146c2d1c15ab5d694fb946e90dea6 | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Nov 23 16:50:30 2016 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Nov 23 16:50:30 2016 +0000 |
| tree | 150703604bcf4bb252ed7852840933744b41e079 | |
| parent | e5ae7811b0ca184934a38cda7719de5d6c1372bd [diff] | |
| parent | e9d1b299ccbf8017ba57040986ded638f954684a [diff] |
Merge "Revert "make it illegal to include SkXfermode.h"" into master-skia https://skia.googlesource.com/skia/+/e9d1b299ccbf8017ba57040986ded638f954684a Change-Id: Ie6daa2d77d71352d00e67efdda1b36f628864735