John Reck bf4b31f7b2 resolve merge conflicts of 04ce46db64 to master. ...

Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5

2015-12-16 11:07:53 -08:00

..

CanvasContext.cpp

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

CanvasContext.h

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

DrawFrameTask.cpp

Simplify TreeInfo

2015-10-28 15:55:40 -07:00

DrawFrameTask.h

Rename DisplayListData to DisplayList

2015-10-16 10:38:34 -07:00

EglManager.cpp

add DeviceInfo

2015-11-05 10:13:23 -08:00

EglManager.h

Support new EGL extensions

2015-08-12 14:26:05 -07:00

RenderProxy.cpp

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

RenderProxy.h

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

RenderTask.cpp

…

RenderTask.h

…

RenderThread.cpp

Fix threading issues

2015-11-10 13:41:32 -08:00

RenderThread.h

Fix threading issues

2015-11-10 13:41:32 -08:00

TimeLord.cpp

…

TimeLord.h

…