Eric Laurent 6616127218 am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 ... * commit 'dd347d515d4a4e42b2aba89a8e471392026b7824': DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""		2012-01-25 08:57:20 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Fix compilation with Clang."	2012-01-13 15:16:59 -08:00
libs	Get AID_GRAPHICS from right place	2012-01-13 13:45:39 -08:00
opengl	hack up frame latency measurement	2012-01-24 15:41:50 -08:00
services/surfaceflinger	improve SurfaceFlinger dumpsys	2012-01-24 18:22:56 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00