Matthew Xie 367ee7f345 am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 ... * commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5': Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp		2011-11-08 07:00:33 +00: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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00