Stephen Hines 69be0ab40c Merge "Fix broken assert (if input allocation is NULL)."		2011-04-18 10:25:57 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"	2011-04-18 08:12:36 -07:00
libs	Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"	2011-04-18 08:12:36 -07:00
opengl	Kill the global references in the OpenGL wrappers.	2011-04-11 15:31:20 -07:00
services/surfaceflinger	Fix a GraphicBuffer leak in SurfaceTexture	2011-04-08 19:28:04 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -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 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00