Romain Guy 571fbbcab3 Merge "Record possible clip rejects when recording display lists"		2012-02-17 15:18:14 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Merge "Clean up InputChannel file descriptor data type."	2012-02-14 17:11:41 -08:00
libs	libs/utils: replace malloc() + memset() to zero with calloc()	2012-02-17 14:27:13 -08:00
opengl	gltrace: Trace thread time and wall clock time.	2012-02-17 11:09:47 -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