Hung-ying Tyan d19b510c39 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread ... Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d' * commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d': Silently reject a ringing call when another call is dialing/ringing.		2010-10-21 10:56:02 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "Add length-equality test in String operator== checks."	2010-10-20 17:06:28 -07:00
libs	resolved conflicts for merge of 368fdba4 to master	2010-10-21 07:39:10 -07:00
opengl	am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread	2010-10-21 10:47:32 -07:00
services/surfaceflinger	am 9f6d18ca: am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread	2010-10-16 08:58:35 -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	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00