Andreas Huber 29c5c4f577 am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 ... * commit '92860d5d4681e684d5f3936137c6c067c950121e': DO NOT MERGE: Remove the AVI extractor.		2011-12-06 16:59:52 -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	gltrace: Make framebuffer contents an optional message.	2011-12-05 14:13:16 -08:00
services/surfaceflinger	fix a deadlock when removing a DisplayEventConnection	2011-12-05 19:58:47 -08:00
MODULE_LICENSE_APACHE2
NOTICE