Jason Chen 5ce02e52b2 resolved conflicts for merge of '1d58e52a' into master ... Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f		2010-10-11 09:24:33 -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	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00