Dianne Hackborn 6c15faf98e Merge "resolved conflicts for merge of 037b54cf to master"		2011-05-11 12:50:39 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	resolved conflicts for merge of 05be6d6f to master	2011-05-09 19:00:59 -07:00
libs	resolved conflicts for merge of 05be6d6f to master	2011-05-09 19:00:59 -07:00
opengl	frameworks/base: android_native_buffer_t -> ANativeWindowBuffer	2011-05-03 16:40:14 -07:00
services/surfaceflinger	Fix a race in SurfaceFlinger that could cause layers to be leaked forever.	2011-05-03 20:44:51 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +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