Jeff Sharkey f956b400b3 Merge "Background data notification, API clean up."		2011-08-18 15:01:10 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SurfaceTexture: fix queues-to-composer"	2011-08-18 14:31:39 -07:00
libs	Merge "SurfaceTexture: fix queues-to-composer"	2011-08-18 14:31:39 -07:00
opengl	fix test-opengl-swapinterval	2011-08-15 15:25:40 -07:00
services/surfaceflinger	SurfaceTexture: fix queues-to-composer	2011-08-17 18:19:00 -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