Chih-Hung Hsieh 85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp ...

Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f

2016-04-28 12:08:15 -07:00

..

CanvasContext.cpp

Merge "Make getFrameNumber lazy" into nyc-dev

2016-04-18 23:20:39 +00:00

CanvasContext.h

Make getFrameNumber lazy

2016-04-18 14:34:18 -07:00

DrawFrameTask.cpp

Don't reuse LOST_SURFACE for stopped

2016-04-18 11:29:35 -07:00

DrawFrameTask.h

Don't reuse LOST_SURFACE for stopped

2016-04-18 11:29:35 -07:00

EglManager.cpp

Revert "Revert "Make stopped state a first-class thing""

2016-04-14 10:39:03 -07:00

EglManager.h

Always swap buffers if using partial update extension

2016-02-26 14:58:13 -08:00

RenderProxy.cpp

API tweaks to PixelCopy and make it public

2016-04-26 15:41:43 -07:00

RenderProxy.h

API tweaks to PixelCopy and make it public

2016-04-26 15:41:43 -07:00

RenderTask.cpp

…

RenderTask.h

…

RenderThread.cpp

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

RenderThread.h

…

TimeLord.cpp

…

TimeLord.h

…