Scott Main cf2106f20b resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp ... Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef		2011-01-11 14:51:21 -08:00
cmds
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