7be3e5d2d8
Conflicts: libs/surfaceflinger/Layer.cpp libs/surfaceflinger/SurfaceFlinger.cpp opengl/libagl/egl.cpp opengl/libs/EGL/egl.cpp opengl/libs/GLES_CM/gl.cpp opengl/libs/GLES_CM/gl_api.in opengl/libs/gl_entries.in opengl/libs/tools/glapigen |
||
---|---|---|
.. | ||
DisplayHardware | ||
GPUHardware | ||
purgatory | ||
tests | ||
Android.mk | ||
Barrier.h | ||
BlurFilter.cpp | ||
BlurFilter.h | ||
BootAnimation.cpp | ||
BootAnimation.h | ||
BufferAllocator.cpp | ||
BufferAllocator.h | ||
clz.cpp | ||
clz.h | ||
Layer.cpp | ||
Layer.h | ||
LayerBase.cpp | ||
LayerBase.h | ||
LayerBitmap.cpp | ||
LayerBitmap.h | ||
LayerBlur.cpp | ||
LayerBlur.h | ||
LayerBuffer.cpp | ||
LayerBuffer.h | ||
LayerDim.cpp | ||
LayerDim.h | ||
LayerOrientationAnim.cpp | ||
LayerOrientationAnim.h | ||
LayerOrientationAnimRotate.cpp | ||
LayerOrientationAnimRotate.h | ||
MessageQueue.cpp | ||
MessageQueue.h | ||
MODULE_LICENSE_APACHE2 | ||
OrientationAnimation.cpp | ||
OrientationAnimation.h | ||
SurfaceFlinger.cpp | ||
SurfaceFlinger.h | ||
Tokenizer.cpp | ||
Tokenizer.h | ||
Transform.cpp | ||
Transform.h | ||
VRamHeap.cpp | ||
VRamHeap.h |