Dianne Hackborn 3c4fe4b1f3 Merge "resolved conflicts for merge of 78e9f4cb to master"		2010-12-13 16:28:01 -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	Hardware Composer Stress Test Enhancements	2010-12-13 13:19:13 -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