Gilles Debunne 4251f75f07 resolved conflicts for merge of 115b9dc3 to master ... Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339		2010-10-04 14:02:50 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am ac754073: am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread	2010-10-04 07:54:06 -07:00
libs	am ac754073: am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread	2010-10-04 07:54:06 -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