Marco Nelissen b2fd84ad1d resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp ...

Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643

2011-06-06 09:55:15 -07:00

..

DisplayHardware

…

tests

Fix missing AOSP copyright headers for more files

2011-03-17 14:43:12 -07:00

Android.mk

…

Barrier.h

…

clz.cpp

…

clz.h

…

GLExtensions.cpp

…

GLExtensions.h

…

Layer.cpp

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00

Layer.h

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00

LayerBase.cpp

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00

LayerBase.h

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00

LayerDim.cpp

revert the surface purgatory list and dependent changes.

2011-03-09 17:00:41 -08:00

LayerDim.h

…

MessageQueue.cpp

…

MessageQueue.h

…

MODULE_LICENSE_APACHE2

…

SurfaceFlinger.cpp

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00

SurfaceFlinger.h

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00

TextureManager.cpp

Fixed to draw texture when loadTexture() is called at first time

2011-04-05 08:58:44 +02:00

TextureManager.h

…

Transform.cpp

…

Transform.h

…