Jason Chen 68fd208a9e Merge "Resolved conflicts for merge of 2bd6afed to master"		2010-10-08 13:15:11 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread	2010-10-07 12:20:45 -07:00
libs	am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread	2010-10-07 12:20:45 -07:00
opengl	libagl: eglSwapInterval fix	2010-10-06 16:44:37 -07:00
services/surfaceflinger	Fix a null dereference	2010-10-07 14:57:04 -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