Jeff Hamilton 0d389cc6ab Merge "Swap Mifare for MIFARE." into honeycomb-mr2		2011-05-25 15:38:56 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	2011-05-25 14:37:17 -07:00
libs	Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	2011-05-25 14:37:17 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:32: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