Dianne Hackborn cdc3ed2d11 resolved conflicts for merge of a80bab37 to master ... Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef		2011-12-13 16:31:43 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917"	2011-12-08 18:51:03 -08:00
libs	am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1	2011-12-12 16:10:28 -08:00
opengl	Fix convert8To4, convert8To5	2011-12-09 14:06:07 -08:00
services/surfaceflinger	Improve the VSYNC api a bit.	2011-12-06 22:43:10 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00