Robert Ly d53f6430b0 am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 ... * commit '4e552533ea049970b54c1cdba5afb7d13496c3c1': cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16		2012-01-19 13:32:51 -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