Jean-Baptiste Queru f3b2a34e71 am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" ... * commit '95306d85005f165e10a25ad45cadadec6e1f6a31': stagefright aacenc: Fix type definitions for 64 bit platforms		2012-01-25 10:33:42 -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