Scott Main 91254c988c Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1		2011-10-27 14:43:50 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-18 23:00:08 -07:00
libs	add -ldl to host executables	2011-10-20 16:21:25 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Merge "Fix software GL renderer."	2011-10-21 16:22:15 -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