Mathias Agopian a5ab8ce602 resolved conflicts for merge of 48a86240 to master ...

Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5

2010-09-15 12:29:18 -07:00

..

DisplayHardware

resolved conflicts for merge of 48a86240 to master

2010-09-15 12:29:18 -07:00

tests

…

Android.mk

Squashed commit of the following:

2010-08-23 12:30:24 -07:00

Barrier.h

…

BlurFilter.cpp

…

BlurFilter.h

…

clz.cpp

…

clz.h

…

GLExtensions.cpp

…

GLExtensions.h

…

Layer.cpp

am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread

2010-08-25 16:40:28 -07:00

Layer.h

revert hwcomposer HAL changes. DO NOT MERGE.

2010-08-17 20:22:04 -07:00

LayerBase.cpp

am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread

2010-08-24 17:56:40 -07:00

LayerBase.h

am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread

2010-08-24 17:56:40 -07:00

LayerBlur.cpp

fix [2931513] Add support for setting the orientation of an ANativeWindow

2010-08-24 15:40:50 -07:00

LayerBlur.h

…

LayerBuffer.cpp

am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread

2010-08-24 16:28:57 -07:00

LayerBuffer.h

…

LayerDim.cpp

…

LayerDim.h

…

MessageQueue.cpp

…

MessageQueue.h

…

MODULE_LICENSE_APACHE2

…

SurfaceFlinger.cpp

resolved conflicts for merge of 48a86240 to master

2010-09-15 12:29:18 -07:00

SurfaceFlinger.h

revert hwcomposer HAL changes. DO NOT MERGE.

2010-08-17 20:22:04 -07:00

TextureManager.cpp

remove unused pixel format

2010-08-19 13:11:42 -07:00

TextureManager.h

fix [2931513] Add support for setting the orientation of an ANativeWindow

2010-08-24 15:40:50 -07:00

Transform.cpp

…

Transform.h

…