Eric Laurent e9e2f6f78a resolved conflicts for merge of 1a4b9939 to master ... Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2		2012-01-04 17:39:12 -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 user settings to control data captured.	2012-01-04 12:50:13 -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
NOTICE