Nick Pelly bb3a9c3304 Merge "NFC: Submit the missing pieces of previous commit to fix build."		2011-06-10 15:23:37 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	resolved conflicts for merge of f51ded0f to master	2011-06-10 12:45:36 -07:00
libs	resolved conflicts for merge of f51ded0f to master	2011-06-10 12:45:36 -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