Svetoslav Ganov 4ddff39362 Merge "Exception in TouchExplorer due to invalid pointer id."		2011-07-16 13:42:11 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge changes Id9aa1003,I8c154189	2011-07-14 17:54:27 -07:00
libs	Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"	2011-07-15 12:35:34 -07:00
opengl	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
services/surfaceflinger	dump GLES strings in SF dumpsys log	2011-07-15 14:29:25 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00