Bart Sears 53cc3c7676 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 ... * commit '705665acda5fec6c8c76683b2e5850b0bd447449': Do not allow file:// access when it is disabled. Do not merge.		2012-01-04 13:49:34 -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