Gloria Wang 5a0a45ff18 am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp ... Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382' * commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382': Update of DRM framework.		2010-10-10 12:51:00 -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 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