Joe Fernandez 11d2747fdd am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 ... * commit '4f21e3a08adefbb5e109e2f844386ed844c1c436': docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)		2012-02-09 13:51:00 -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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00