Wei-Ta Chen 2fab5a3a1a am 62cd5c97: (-s ours) am 61d9ffbf: Merge "Do not merge." into gingerbread ... * commit '62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf': Do not merge.		2011-01-13 12:38:38 -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	Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb	2011-01-13 12:13:56 -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	Revert "Remove the APIs for the old encryption scheme."	2011-01-13 14:15:43 -06:00
MODULE_LICENSE_APACHE2
NOTICE	Fix merge conflict for 'c506ab89'	2011-01-13 11:48:42 -08:00