Brian Colonna bcedde8848 resolved conflicts for merge of 7cf1eeb9 to master ... Change-Id: Id125e315e24ced927f3a500135af7e5aff50cfa2		2011-11-09 16:13:51 -05:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.	2011-11-07 15:51:31 +00:00
libs	Fix possible leak in Parcel::writeDupFileDescriptor.	2011-11-07 12:22:39 -08:00
opengl	EGL: Add stubs for EGL_ANDROID_blob_cache	2011-11-04 15:01:51 -07:00
services/surfaceflinger	Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1	2011-11-07 21:33:53 -08:00
MODULE_LICENSE_APACHE2
NOTICE