Mathias Agopian 43bf132be8 am 3b6731b3: am baf9af94: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into honeycomb ... * commit '3b6731b32dae652700a6908f5d838b62d39c0962': Use EGL_NATIVE_VISUAL_ID to select EGLConfig		2011-01-19 18:29:16 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Add joystick support to framework."	2011-01-17 15:57:44 -08:00
libs	am 3b6731b3: am baf9af94: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into honeycomb	2011-01-19 18:29:16 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	improve SurfaceFlinger 'dumpsys' log	2011-01-19 16:15:53 -08:00
vpn	Revert "Remove the APIs for the old encryption scheme."	2011-01-13 14:15:43 -06: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