Siva Velusamy 875bdea8be Merge "gltrace: add start time & duration to each traced call."		2012-01-04 12:48:52 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Add a new ui mode for "appliance"	2011-12-15 16:16:14 -08:00
libs	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE	2012-01-03 22:38:27 +00:00
opengl	gltrace: add start time & duration to each traced call.	2012-01-04 11:38:37 -08:00
services/surfaceflinger	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE	2012-01-03 22:38:27 +00: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