Robert Greenwalt af2eab2285 am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1 ... * commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2': Be careful sharing connections when dun is in play		2011-12-02 17:57:37 -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	fix an issue where updates could starve transactions	2011-12-02 16:11:19 -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