Gilles Debunne f7f27a15b3 resolved conflicts for merge of bd38710b to master ... Change-Id: I3489b6909ce2a215318d45f809b82579503fd733		2010-10-10 13:55:49 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread	2010-10-10 12:52:40 -07:00
libs	am f10929fb: am a1bf0a06: Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread	2010-10-10 12:53:39 -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