Justin Ho 8e921010aa Resolved conflicts for merge of 83cf0313 to master ... Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344		2011-10-10 16:46:35 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Fix regression in CursorWindow.copyStingToBuffer.	2011-10-07 13:28:18 -07:00
libs	Fix regression in CursorWindow.copyStingToBuffer.	2011-10-07 13:28:18 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Merge "enable EGL_IMG_context_priority for the omap4 platform"	2011-10-10 12:38:16 -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