Nick Pelly f4ac8d5680 Merge "resolved conflicts for merge of 1d0d1188 to master"		2010-12-13 12:25:22 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	[3258939] Need snapshot to limit which layers are included	2010-12-10 16:22:31 -08:00
libs	Merge "[3258939] Need snapshot to limit which layers are included"	2010-12-10 16:30:46 -08:00
opengl	fix build.	2010-12-08 17:44:07 -08:00
services/surfaceflinger	[3258939] Need snapshot to limit which layers are included	2010-12-10 16:22:31 -08:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00