Dianne Hackborn c01d0f9bb8 resolved conflicts for merge of 9c7489f8 to master ... Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4		2010-10-22 14:35:09 -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	am 7ba8c44e: am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread	2010-10-22 09:14:28 -07:00
opengl	am 49af98ed: am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread	2010-10-21 17:23:24 -07:00
services/surfaceflinger	am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread	2010-10-21 13:48:36 -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