Mathias Agopian 3441386f6e am 246bd60e: am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb ... * commit '246bd60efa89376918e5d4cd53d2ed4f9288bf8d': fix [3361121] hang in glClear() - device unresponsive, OTA fails		2011-01-18 21:59:58 -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 246bd60e: am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb	2011-01-18 21:59:58 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	Add logs when taking a screenshot to help tracking issue 3361121	2011-01-16 17:25:26 -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