Scott Main a8399c8a13 resolved conflicts for merge of b6cf4b7f to ics-mr1 ... Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320		2011-10-27 14:40:53 -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
NOTICE