Jean-Baptiste Queru cb4c6ef4d7 Merge from master ... Change-Id: I62479982edbb2229f84d20a581cccb703bdfc87b		2012-02-14 10:04:12 -08:00
cmds	Merge "Fix build warnings"	2012-02-13 16:43:43 -08:00
include	Update comments	2012-02-14 09:17:59 -08:00
libs	Accurately track the sequence numbers of batched events.	2012-02-13 13:59:32 -08:00
opengl	fix a dead-lock in eglMakeCurrent	2012-02-03 15:24:51 -08:00
services/surfaceflinger	Merge "Return information about whether overlays are disabled."	2012-02-07 13:46:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00