Gilles Debunne 5922b6238b resolved conflicts for merge of d7d47941 to master ... Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e		2010-10-10 18:45:23 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Move binder magic from the Surface class to GraphicBuffer."	2010-10-10 13:36:13 -07:00
libs	Merge "Move binder magic from the Surface class to GraphicBuffer."	2010-10-10 13:36:13 -07:00
opengl	libagl: eglSwapInterval fix	2010-10-06 16:44:37 -07:00
services/surfaceflinger	fix a bug where timeouts would only be handled when a message was delivered	2010-10-07 19:59:06 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE