Scott Main dc7921f533 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 ... Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d' * commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38		2010-10-05 15:17:40 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00