Robert Greenwalt 0cd3472530 resolved conflicts for merge of 40717996 to master ... Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada		2011-06-24 16:10:06 -07:00
cmds	Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)	2011-06-23 02:10:23 -07:00
include	Add allowSynchronousMode to SurfaceTexture constructor.	2011-06-23 21:21:47 -07:00
libs	Add allowSynchronousMode to SurfaceTexture constructor.	2011-06-23 21:21:47 -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
MODULE_LICENSE_APACHE2
NOTICE