Jeff Brown 1d3a7130f9 Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2		2011-06-06 20:32:18 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:32:18 -07:00
libs	Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:32:18 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)	2011-06-06 15:14:25 -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