Chet Haase 77c09f847b resolved conflicts for merge of aa4d2f69 to master ... Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620		2011-11-05 12:01:51 -07: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
NOTICE