Dianne Hackborn 3f95c7588b am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 ... * commit '960177ae394a466d765a2dc171e136f9fdea06b6': DO NOT MERGE. Integrate: Include showmap output in bug report.		2011-11-05 19:33:39 +00:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1	2011-11-03 18:55:14 +00:00
libs	Merge "Slight change to the unwinder API."	2011-11-04 20:06:42 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	fix Corrupted graphics while playing You Tube on orientation change	2011-10-26 15:11:59 -07: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