Dianne Hackborn 07df65ab5e resolved conflicts for merge of 4d28e8c5 to master ... Change-Id: I2449488a84e44b3fb5f820b50951b2b2bfa3bcbf		2010-10-01 16:44:12 -07:00
cmds	KeyStore: Initialize IV correctly.	2010-09-30 17:28:01 +08:00
include	Merge "refactored screenshot code"	2010-10-01 12:15:12 -07:00
libs	Merge "refactored screenshot code"	2010-10-01 12:15:12 -07:00
opengl	Initial checkin of a framerate test app	2010-09-28 14:59:20 -07:00
services/surfaceflinger	refactored screenshot code	2010-09-29 16:55:15 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE