Dave Sparks 9f1234e460 resolved conflicts for merge of 04c7d0f8 to master		2009-07-08 17:26:05 -07:00
..
egl	get rid off unneeded flags	2009-05-05 18:29:35 -07:00
BufferMapper.h	update surfaceflinger, libui and libagl to the new gralloc api	2009-05-04 14:17:04 -07:00
Camera.h	Add timestamps to video frames to improve A/V sync.	2009-07-08 15:59:25 -07:00
CameraHardwareInterface.h	resolved conflicts for merge of 04c7d0f8 to master	2009-07-08 17:26:05 -07:00
CameraParameters.h
DisplayInfo.h
EGLNativeSurface.h
EventHub.h	get rid of utils.h	2009-05-31 19:13:00 -07:00
FramebufferNativeWindow.h	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.h	move libbinder's header files under includes/binder	2009-05-20 12:55:03 -07:00
ICameraClient.h	resolved conflicts for merge of 04c7d0f8 to master	2009-07-08 17:26:05 -07:00
ICameraService.h	move libbinder's header files under includes/binder	2009-05-20 12:55:03 -07:00
IOverlay.h	move libbinder's header files under includes/binder	2009-05-20 12:55:03 -07:00
ISurface.h	merge master to master_gl	2009-05-22 02:16:08 -07:00
ISurfaceComposer.h	get rid of references to MemoryDealer in SurfaceFlinger	2009-07-02 18:50:51 -07:00
ISurfaceFlingerClient.h	get rid of references to MemoryDealer in SurfaceFlinger	2009-07-02 18:50:51 -07:00
KeyCharacterMap.h
KeycodeLabels.h
Overlay.h	move libbinder's header files under includes/binder	2009-05-20 12:55:03 -07:00
PixelFormat.h
Point.h	minor clean-up to Rect and Point.	2009-05-26 17:47:39 -07:00
Rect.h	oops forgot these changes in the previous merge. fixes build	2009-05-27 15:02:35 -07:00
Region.h	Region::makeBoundsSelf() efficiently turns a region to its bounds	2009-06-29 18:46:37 -07:00
Surface.h	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
SurfaceComposerClient.h	get rid of references to MemoryDealer in SurfaceFlinger	2009-07-02 18:50:51 -07:00