Jeff Hamilton 86d7998cf7 Merge "API changes for NFC." into gingerbread		2011-01-21 11:34:20 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Filter virtual keys after touches. (DO NOT MERGE)	2011-01-11 20:56:04 -08:00
libs	Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread	2011-01-19 11:31:07 -08:00
opengl	fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo	2010-12-08 15:34:02 -08:00
services/surfaceflinger	disable the bypass mode. DO NOT MERGE.	2010-12-18 03:45:26 -08:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00