Chih-Hung Hsieh 0a87059452 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp ...

Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5

2016-05-19 16:22:09 -07:00

..

Blur.cpp

…

Blur.h

…

Color.h

Add ListView rendering benchmark

2015-12-02 15:20:26 -08:00

FatVector.h

…

GLUtils.cpp

Add fine-grained debug layer

2016-01-25 16:15:14 -08:00

GLUtils.h

Add fine-grained debug layer

2016-01-25 16:15:14 -08:00

LinearAllocator.cpp

resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp

2016-05-19 16:22:09 -07:00

LinearAllocator.h

Add create_trivial_array

2016-02-19 15:51:02 -08:00

Macros.h

Stop comparing Descriptions with memcmp

2016-04-11 13:09:00 -07:00

MathUtils.h

…

NinePatch.h

…

NinePatchImpl.cpp

…

PaintUtils.h

Overdraw avoidance in new pipeline

2016-03-29 13:30:15 -07:00

Pair.h

…

RingBuffer.h

make RingBuffer const viable

2015-12-09 14:44:01 -08:00

StringUtils.cpp

…

StringUtils.h

Support op dumping in new pipeline

2016-02-23 18:52:54 +00:00

TestWindowContext.cpp

Fix some edge cases

2016-04-07 14:10:43 -07:00

TestWindowContext.h

Fix leak of file descriptors in test code

2015-12-10 22:19:17 +00:00

TimeUtils.h

…

Timing.h

…

TraceUtils.h

…

VectorDrawableUtils.cpp

…

VectorDrawableUtils.h

VectorDrawable native rendering - Step 3 of MANY

2015-12-28 16:08:38 -08:00