Mathias Agopian b353fd9746 Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb		2011-01-14 19:27:32 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb	2011-01-14 19:27:32 -08:00
libs	Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb	2011-01-14 19:27:32 -08:00
opengl	Hardware Composer Test hwcCommit set blend type	2011-01-10 18:03:05 -08:00
services/surfaceflinger	Merge "fix [3312683] Camera mirroring problem after switching from back to front camera" into honeycomb	2011-01-14 10:54:47 -08:00
vpn	Revert "Remove the APIs for the old encryption scheme."	2011-01-13 14:15:43 -06:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00