Eric Fischer 10f5e63282 Merge "Import translations. DO NOT MERGE"		2012-02-09 11:37:18 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."	2012-02-09 11:08:02 -08:00
libs	Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."	2012-02-09 11:08:02 -08:00
opengl	fix a dead-lock in eglMakeCurrent	2012-02-03 15:24:51 -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