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

..

assets

Automated import from //branches/master/...@141533,141533

2009-03-24 20:29:58 -07:00

res

Merge commit 'goog/master' into merge_master

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

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

AndroidManifest.xml

am 947fe79: Merge change 483 into donut

2009-04-29 13:11:28 -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