Andreas Gampe edaecc1db0 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp ...

(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)

Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172

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

..

CanvasContext.cpp

am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev

2014-11-07 23:01:00 +00:00

CanvasContext.h

Have an actual fallback if the surface is lost

2014-11-07 11:02:07 -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 e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0

2014-10-31 23:30:57 +00:00

EglManager.h

Layer changes

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

RenderProxy.cpp

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

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

RenderProxy.h

Layer changes

2014-10-31 15:30:10 -07: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

Fix nano vs. millis

2014-01-29 19:59:16 -08:00

RenderThread.cpp

Layer changes

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

RenderThread.h

Yet more layer tracking logging

2014-09-04 17:40:05 -07:00

TimeLord.cpp

Surface:lockHardwareCanvas

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

TimeLord.h

Animator stuff

2014-08-27 17:44:25 -07:00