Joe Fernandez 976238bf5c am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 ... * commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22': docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)		2012-02-09 13:46:55 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge changes I7e973a35,Ib3386fcc into ics-mr1	2011-11-29 17:46:35 -08:00
libs	SurfaceTexture: fix a verbose-log compile error	2011-12-09 15:07:44 -08:00
opengl	add a way to access the version string of the h/w implementation of EGL	2011-11-29 18:00:35 -08:00
services/surfaceflinger	SurfaceFlinger: fix layer removal race condition	2011-12-02 10:03:25 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00