Dave Sparks 6698d16b95 resolved conflicts for merge of 04c7d0f8 to master

2009-07-08 17:26:05 -07:00

..

tests

Region now has its own implementation instead of relying on SkRegion, which allows us to break libui's dependency on libcorecg.

2009-05-17 23:34:16 -07:00

Android.mk

Merge commit 'goog/master' into merge_master

2009-07-01 18:33:18 -07:00

BufferMapper.cpp

move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h

2009-05-05 18:11:11 -07:00

Camera.cpp

resolved conflicts for merge of 04c7d0f8 to master

2009-07-08 17:26:05 -07:00

CameraParameters.cpp

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

EventHub.cpp

get rid of utils.h

2009-05-31 19:13:00 -07:00

EventRecurrence.cpp

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

FramebufferNativeWindow.cpp

make use of new eglGetRenderBufferANDROID extension to clean-up a bit a few hacks added recently

2009-06-25 00:09:27 -07:00

ICamera.cpp

some work to try to reduce the code size of some native libraries

2009-05-26 16:12:20 -07:00

ICameraClient.cpp

resolved conflicts for merge of 04c7d0f8 to master

2009-07-08 17:26:05 -07:00

ICameraService.cpp

some work to try to reduce the code size of some native libraries

2009-05-26 16:12:20 -07:00

IOverlay.cpp

some work to try to reduce the code size of some native libraries

2009-05-26 16:12:20 -07:00

ISurface.cpp

Merge commit 'goog/master' into merge_master

2009-05-27 14:34:50 -07:00

ISurfaceComposer.cpp

get rid of references to MemoryDealer in SurfaceFlinger

2009-07-02 18:50:51 -07:00

ISurfaceFlingerClient.cpp

get rid of references to MemoryDealer in SurfaceFlinger

2009-07-02 18:50:51 -07:00

KeyCharacterMap.cpp

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

KeyLayoutMap.cpp

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

KeyLayoutMap.h

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LayerState.cpp

move libbinder's header files under includes/binder

2009-05-20 12:55:03 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Overlay.cpp

change 2115 wasn't merged properly into master. this fixes that.

2009-05-21 16:29:38 -07:00

PixelFormat.cpp

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Rect.cpp

minor clean-up to Rect and Point.

2009-05-26 17:47:39 -07:00

Region.cpp

should fix sim build

2009-07-06 18:07:26 -07:00

Surface.cpp

fix typo defining a singleton attrbutes for an object that is not a singleton -- no side effects, but useless

2009-05-28 12:31:00 -07:00

SurfaceComposerClient.cpp

get rid of references to MemoryDealer in SurfaceFlinger

2009-07-02 18:50:51 -07:00

SurfaceFlingerSynchro.cpp

move libbinder's header files under includes/binder

2009-05-20 12:55:03 -07:00