Jamie Gennis de3b072b12 Merge "libgui: have ST::updateTexImage check the GL ctx"		2012-03-20 12:03:29 -07:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Merge "libgui: have ST::updateTexImage check the GL ctx"	2012-03-20 12:03:29 -07:00
libs	Merge "libgui: have ST::updateTexImage check the GL ctx"	2012-03-20 12:03:29 -07:00
opengl	gltrace: Only accept connections from the shell.	2012-03-15 16:41:35 -07:00
services/surfaceflinger	SurfaceTexture: Fully refactored from BufferQueue	2012-03-13 14:39:07 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00