Mathias Agopian fa6eda01a9 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_runtime

AI 143840: Split VM initialization out into a separate function.

2009-03-31 15:52:13 -07:00

media

Fix issue 1745312: Various cleanups in media framework

2009-04-21 07:56:33 -07:00

pim

auto import from //depot/cupcake/@135843

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

private

a brand new MessageQueue for SurfaceFlinger.

2009-04-24 16:22:36 -07:00

ui

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

utils

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

utils.h

auto import from //depot/cupcake/@135843

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