Dianne Hackborn 1efc517621 am ec42750e: am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 ... * commit 'ec42750e4d0e695515d078fb1f222c99a705fd93': Fix issue #5714517: App shortcuts can result in bad task intents		2011-12-05 19:20:45 -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	Merge "fix an issue where invalidate/transactions could be missed"	2011-12-04 00:45:50 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00