Dave Sparks 9f1234e460 resolved conflicts for merge of 04c7d0f8 to master		2009-07-08 17:26:05 -07:00
..
tests
Android.mk	Merge commit 'goog/master' into merge_master	2009-07-01 18:33:18 -07:00
BufferMapper.cpp
Camera.cpp	resolved conflicts for merge of 04c7d0f8 to master	2009-07-08 17:26:05 -07:00
CameraParameters.cpp
EventHub.cpp	get rid of utils.h	2009-05-31 19:13:00 -07:00
EventRecurrence.cpp
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
ICameraClient.cpp	resolved conflicts for merge of 04c7d0f8 to master	2009-07-08 17:26:05 -07:00
ICameraService.cpp
IOverlay.cpp
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
KeyLayoutMap.cpp
KeyLayoutMap.h
LayerState.cpp
MODULE_LICENSE_APACHE2
NOTICE
Overlay.cpp
PixelFormat.cpp
Rect.cpp
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