Jeff Hamilton 1dd3301c8c resolved conflicts for merge of dc54a8c7 to honeycomb-merge ... Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8		2011-01-28 20:41:42 -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	am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread	2011-01-27 11:24:33 -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 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00