| commit | 60a9b8e11b10563167107cebafd1cc25d825d7b1 | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Mon Feb 04 09:57:09 2013 -0500 |
| committer | Derek Sollenberger <djsollen@google.com> | Mon Feb 04 15:45:03 2013 -0500 |
| tree | 214580de8a3870cf182e846fc1dbad7395da4876 | |
| parent | ed7d68ffc497b77bf383749294bbc727f1c4e548 [diff] | |
| parent | d686ac77c2c485c4a3302eda9c1de597a6f8c568 [diff] |
Merge Skia @7527 Conflicts resolved in: include/gpu/GrBackendEffectFactory.h src/core/SkPaint.cpp src/effects/gradients/SkLinearGradient.cpp src/ports/FontHostConfiguration_android.cpp Change-Id: I5ad1f8f99f8fdbc26c5f98861701dd0c1cee82fa