Scott Main 344a33a51f am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642 ... * commit 'ad231a303ee8fe7f8b51900d7b57971ab9963ad4': docs: fix xss issue bug 5125642		2012-02-09 16:06:31 -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
NOTICE