Andreas Huber 8e2bb37d9f am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1 ... * commit 'f2e1249846a17c69d728189a8dc67f37261f0a59': Properly identify how much metadata we need to cache in order to instantiate		2011-12-05 12:03:41 -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	Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.	2011-12-01 17:11:32 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00