Jeff Brown 87cd8fc860 Merge "Don't log BlockGuard violations on ENG builds."		2011-10-11 12:35:05 -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 "fix an issue where the screen could stay off"	2011-10-10 22:21:57 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00