Fabrice Di Meglio 46909cfd1c Merge "Fix bug #5017432 NPE when mixing different spans with different font sizes"		2011-08-09 18:35:20 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	return correct value from query after connecting a surface	2011-08-08 20:25:44 -07:00
libs	fix a crasher in dumpsys	2011-08-09 15:49:26 -07:00
opengl	connect/disconnect is now called from our EGL wrapper	2011-08-01 14:06:20 -07:00
services/surfaceflinger	return correct value from query after connecting a surface	2011-08-08 20:25:44 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00