Jim Miller 749e2669da am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 ... * commit '59a3319ffce100d671145b5bfee7450038b250bf': Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI		2011-05-23 20:48:36 -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	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	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