Jean-Baptiste Queru cbafdc6c15 am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" ... * commit 'e2594b85093441e03150c7cfc540abc626884eaf': stagefright amrwbenc: Make the mem_malloc function 64-bit safe		2012-01-25 08:57:36 -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