Robert Greenwalt 75e4c00db5 Merge "Filter our v6 address from tethering dns."		2012-01-05 11:39:26 -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	Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"	2012-01-05 07:38:29 -08:00
opengl	gltrace: add user settings to control data captured.	2012-01-04 12:50:13 -08:00
services/surfaceflinger	Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"	2012-01-05 07:38:29 -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