Robert Greenwalt 4a74b0f478 am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp ... * commit '5a6bec53e224b2db9ecbc6920faab08f4a962256': Simplfy getActive* calls in ConnectivityService		2011-05-21 21:35:38 -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 06a8ceac to master	2011-05-19 21:44:52 -07:00
libs	Merge "Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default"	2011-05-20 13:15:20 -07:00
opengl	eglTerminate() now actually frees up all active egl objects	2011-05-16 19:03:33 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE