Dianne Hackborn 3ae00fabc7 resolved conflicts for merge of bbca8133 to master ... Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6		2011-05-24 11:27:11 -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 bbca8133 to master	2011-05-24 11:27:11 -07:00
libs	Merge "Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default"	2011-05-20 13:15:20 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -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