Jamie Gennis 1eea29f48d Merge "Refactored query function from SurfaceTexture into BufferQueue"		2012-02-14 16:29:02 -08:00
cmds	Merge "Fix build warnings"	2012-02-13 16:43:43 -08:00
include	Merge "Refactored query function from SurfaceTexture into BufferQueue"	2012-02-14 16:29:02 -08:00
libs	Merge "Refactored query function from SurfaceTexture into BufferQueue"	2012-02-14 16:29:02 -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