Eric Fischer b7a38f0f08 Merge "Import translations. DO NOT MERGE"		2012-02-03 13:48:14 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
libs	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
opengl	gltrace: fixup Push & Insert Marker calls	2012-02-01 12:16:40 -08:00
services/surfaceflinger	Merge "separate transactions from updates"	2012-02-02 16:28:05 -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