Mindy Pereira e01f9004a2 am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. ... Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5' * commit '62ad0db62393073a8cda9b21e4ae1506954c10a5': DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.		2010-10-21 10:47:15 -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	libagl: eglSwapInterval fix	2010-10-06 16:44:37 -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
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00