Gilles Debunne 1e3b364b73 resolved conflicts for merge of 2da9338c to master ... Change-Id: I0a5d667b578e23c064ebe7bacc898125fbf40cc2		2010-10-11 12:23:55 -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	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00