Patrick Scott 620f5da650 am 92a9a3c5: Merge "Do not merge." into honeycomb ... * commit '92a9a3c5ef9774863b4cee93d43b67582a02c2f0': Do not merge.		2011-01-12 09:47:09 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix a bug in SurfaceTexture::setBufferCount.	2011-01-09 16:40:06 -08:00
libs	Fix a bug in SurfaceTexture::setBufferCount.	2011-01-09 16:40:06 -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
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00