Jaikumar Ganesh 3d9db684e5 resolved conflicts for merge of 79a5307a to master ... Change-Id: I5a524fe53e74df722db003cec6ab62451fe0f899		2010-10-14 09:39:41 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread	2010-10-13 23:34:21 -07:00
libs	am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread	2010-10-13 23:34:21 -07:00
opengl	libagl: eglSwapInterval fix	2010-10-06 16:44:37 -07:00
services/surfaceflinger	am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread	2010-10-13 23:34:21 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00