JP Abgrall 09e1068230 Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp		2011-11-09 14:36:09 +00:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 5462bc63: Fix a leak in Parcel::writeBlob.	2011-11-05 02:35:57 +00:00
libs	am 5462bc63: Fix a leak in Parcel::writeBlob.	2011-11-05 02:35:57 +00: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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00