replicant-frameworks_native/libs/ui
Mathias Agopian 7be3e5d2d8 Merge commit 'goog/master' into merge_master
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
2009-04-30 14:43:18 -07:00
..
Android.mk Integrate from //sandbox/mathias/donut/...@145728 2009-04-10 14:24:30 -07:00
BufferMapper.cpp Squashed commit of the following: 2009-04-24 15:00:41 -07:00
Camera.cpp Bug fix(1807910): media recorder crash due to the use of locked camera object (last part) 2009-04-27 12:01:59 -07:00
CameraParameters.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
EGLNativeWindowSurface.cpp Integrate from //sandbox/mathias/donut/...@145728 2009-04-10 14:24:30 -07:00
EventHub.cpp Automated import from //branches/donutburger/...@142727,142727 2009-03-25 17:24:35 -07:00
EventRecurrence.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
ICamera.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
ICameraClient.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
ICameraService.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
IOverlay.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
ISurface.cpp Integrate from //sandbox/mathias/donut/...@145728 2009-04-10 14:24:30 -07:00
ISurfaceComposer.cpp Integrate from //sandbox/mathias/donut/...@145728 2009-04-10 14:24:30 -07:00
ISurfaceFlingerClient.cpp Integrate from //sandbox/mathias/donut/...@145728 2009-04-10 14:24:30 -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 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08: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 Integrate from //sandbox/mathias/donut/...@145728 2009-04-10 14:24:30 -07:00
PixelFormat.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
Point.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
Rect.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
Region.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
Surface.cpp Squashed commit of the following: 2009-04-24 15:00:41 -07:00
SurfaceComposerClient.cpp more splitting of Surface/SurfaceControl. Surface.java is now implemented in terms of Surface and SurfaceControl. 2009-04-16 20:04:08 -07:00
SurfaceFlingerSynchro.cpp a brand new MessageQueue for SurfaceFlinger. 2009-04-24 16:22:36 -07:00
Time.cpp auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00