Romain Guy 9fdb20e703 Merge "Clip text correctly Bug #5706056"		2011-12-05 11:56:09 -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	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