John Grossman 391b54aed6 Merge "Really fix the build this time."		2012-02-16 15:28:44 -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	Merge "Refactored query function from SurfaceTexture into BufferQueue"	2012-02-14 16:29:02 -08:00
opengl	Merge "Don't wrap EGLImageKHR and EGLSyncKHR anymore"	2012-02-14 18:59:47 -08:00
services/surfaceflinger	Merge "Return information about whether overlays are disabled."	2012-02-07 13:46:46 -08: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