Jerry J. Wang 1545d8e9e7 Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2		2011-06-22 15:08:25 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 17:22:28 -07:00
libs	revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)	2011-06-15 20:45:32 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 17:22:28 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00