Jean-Baptiste Queru df80c5b180 am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" ... * commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9': stagefright aacenc: Add missing newlines at the end of files		2012-01-25 08:57:32 -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