The Android Automerger 4840d68d65 merge in ics-mr0-release history after reset to ics-mr0		2011-10-25 12:47:52 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Add a LayerScreenshot	2011-10-18 20:21:47 -07:00
libs	SurfaceTexture: free buffers when disconnect fails	2011-10-18 17:14:33 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	CherryPick f9e455 from master to mr0. do not merge.	2011-10-24 13:29:26 -07: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