Mark Salyzyn db15537e6e resolve merge conflicts of 082a1721b516 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

2017-01-11 08:30:17 -08:00

..

Blur.cpp

…

Blur.h

…

Color.h

Various fixes for linear blending and gradients

2016-10-12 13:28:26 -07:00

FatVector.h

…

GLUtils.cpp

…

GLUtils.h

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08:00

LinearAllocator.cpp

…

LinearAllocator.h

…

Macros.h

…

MathUtils.h

…

PaintUtils.h

use SkBlendMode

2016-11-02 11:36:48 -04:00

Pair.h

…

RingBuffer.h

…

StringUtils.cpp

…

StringUtils.h

…

TestWindowContext.cpp

Revert "try to stop using exotic clipps"

2016-12-16 17:49:48 +00:00

TestWindowContext.h

…

TimeUtils.h

…

Timing.h

…

TraceUtils.h

…

VectorDrawableUtils.cpp

…

VectorDrawableUtils.h

…