Andreas Huber 1371ecced5 resolved conflicts for merge of 998a929a to master ... Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8		2011-11-29 15:14:44 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1	2011-11-29 13:17:42 -08:00
libs	Add support for sending VSYNC events to the framework	2011-11-29 13:10:25 -08:00
opengl	Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1	2011-11-21 15:54:54 -08:00
services/surfaceflinger	Add support for sending VSYNC events to the framework	2011-11-29 13:10:25 -08:00
MODULE_LICENSE_APACHE2
NOTICE