John Reck 9fb42f0778 resolved conflicts for merge of a75b0ad3 to master ...

Change-Id: I32a2d129c556407727ada909daa6470309d42499

2014-12-04 13:51:41 -08:00

..

CanvasContext.cpp

resolved conflicts for merge of a75b0ad3 to master

2014-12-04 13:51:41 -08:00

CanvasContext.h

Resume RT-animations after a pauseSurface

2014-12-03 13:03:59 -08:00

DrawFrameTask.cpp

Have an actual fallback if the surface is lost

2014-11-07 11:02:07 -08:00

DrawFrameTask.h

Have an actual fallback if the surface is lost

2014-11-07 11:02:07 -08:00

EglManager.cpp

am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev

2014-11-18 21:37:59 +00:00

EglManager.h

Layer changes

2014-10-31 15:30:10 -07:00

RenderProxy.cpp

resolved conflicts for merge of a75b0ad3 to master

2014-12-04 13:51:41 -08:00

RenderProxy.h

Resume RT-animations after a pauseSurface

2014-12-03 13:03:59 -08:00

RenderTask.cpp

resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp

2014-11-10 21:29:52 -08:00

RenderTask.h

…

RenderThread.cpp

resolved conflicts for merge of a75b0ad3 to master

2014-12-04 13:51:41 -08:00

RenderThread.h

Resume RT-animations after a pauseSurface

2014-12-03 13:03:59 -08:00

TimeLord.cpp

Surface:lockHardwareCanvas

2014-10-21 13:23:56 -07:00

TimeLord.h

…