Brad Fitzpatrick e9f1281c74 resolved conflicts for merge of 6718b365 to master ... Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6		2010-10-01 13:57:04 -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	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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00