Andreas Huber f2ff9ec7f3 resolved conflicts for merge of 07bacabe to master ... Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1		2011-12-05 13:31:17 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1	2011-11-30 10:50:52 -08:00
libs	am f1a4c48b: am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1	2011-12-01 22:08:20 -08:00
opengl	Merge "glestrace: Framework for GLES tracing library"	2011-12-02 15:49:01 -08:00
services/surfaceflinger	Merge "fix an issue where invalidate/transactions could be missed"	2011-12-04 00:45:50 -08:00
MODULE_LICENSE_APACHE2
NOTICE