Glenn Kasten 96fb5532f5 Merge "More audio_stream_type_t"		2012-02-02 13:26:12 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Thread::getTid returns pid_t gettid() after run"	2012-02-02 13:24:52 -08:00
libs	Merge "Thread::getTid returns pid_t gettid() after run"	2012-02-02 13:24:52 -08:00
opengl	gltrace: fixup Push & Insert Marker calls	2012-02-01 12:16:40 -08:00
services/surfaceflinger	Merge "fix an issue with vsync event delivery"	2012-01-31 16:46:27 -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