Jeff Brown 6453b75d38 am 5f668c6e: am 8b9df978: Merge "Fix getSwitchState." into honeycomb ... * commit '5f668c6e6bb2515325632691a804a7c8f24ebb09': Fix getSwitchState.		2011-01-19 18:58:28 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 5f668c6e: am 8b9df978: Merge "Fix getSwitchState." into honeycomb	2011-01-19 18:58:28 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00