Glenn Kasten fb3f824f27 Merge "Use audio_in_acoustics_t consistently"		2012-02-03 08:31:01 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "separate transactions from updates"	2012-02-02 16:28:05 -08:00
libs	Merge "separate transactions from updates"	2012-02-02 16:28:05 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00