Jeff Hamilton f7c2ff5724 resolved conflicts for merge of 52d3203e to honeycomb-merge ... Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b		2011-01-26 23:26:16 -06:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Use optimized display lists for all hwaccelerated rendering	2011-01-24 08:43:20 -08:00
libs	Merge "clean-up unneeded code" into honeycomb	2011-01-20 12:25:26 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb	2011-01-20 12:25:33 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 4330b146 to honeycomb-merge	2011-01-26 23:09:13 -06:00