Jeff Hamilton 2213bb43cc resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp ... Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13		2011-01-25 18:00:41 -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 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread	2011-01-21 10:15:34 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	tone down the log spew regarding taking screenshots.	2011-01-24 18:13:54 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00