Jerry J. Wang 8dd06428c2 am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 ... * commit '4333de2a8e878b319c0e779942b87c042804d352': Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)		2011-06-23 14:29:55 -07:00
cmds	Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)	2011-06-23 02:10:23 -07:00
include	Merge "SurfaceTexture: fix a NULL ptr dereference."	2011-06-20 15:34:00 -07:00
libs	SurfaceTexture: make tests use a large framebuffer.	2011-06-20 15:42:57 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread	2011-06-13 18:39:45 -07: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