Amith Yamasani 76d5cf4bf8 Merge "Mixed up uid and user-id."		2012-02-14 16:12:27 -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	EGLConfig is now not remaped to an internal EGLConfig	2012-02-13 20:23:15 -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