Romain Guy b634cd3f13 Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917"		2011-12-08 18:51:03 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917"	2011-12-08 18:51:03 -08:00
libs	Improve the VSYNC api a bit.	2011-12-06 22:43:10 -08:00
opengl	gltrace: Make framebuffer contents an optional message.	2011-12-05 14:13:16 -08:00
services/surfaceflinger	Improve the VSYNC api a bit.	2011-12-06 22:43:10 -08: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