Dan Morrill b34b504aff Fix merge conflict for 'c506ab89' ... Conflicts: NOTICE Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6		2011-01-13 11:48:42 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Implement crop & transform for SurfaceTexture.	2011-01-12 11:28:38 -08:00
libs	am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread	2011-01-12 20:48:44 -08:00
opengl	Hardware Composer Test hwcCommit set blend type	2011-01-10 18:03:05 -08:00
services/surfaceflinger	Add the ISurfaceComposer::createGraphicBuffer IPC.	2011-01-06 13:12:35 -08:00
vpn	Remove the APIs for the old encryption scheme.	2011-01-12 15:01:34 -06:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Fix merge conflict for 'c506ab89'	2011-01-13 11:48:42 -08:00