Chet Haase 106a34c475 Merge "Make the TimeAnimator class public."		2012-02-03 17:48:11 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
libs	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
opengl	fix a dead-lock in eglMakeCurrent	2012-02-03 15:24:51 -08:00
services/surfaceflinger	attempt to fix an ANR in various apps	2012-02-03 17:22:09 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00