Jake Hamby 5403b2a82d resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp ... Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2		2011-06-07 15:01:50 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:36:49 -07:00
libs	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:36:49 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -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