Jake Hamby ca1df0ccac resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp ... Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a		2011-06-07 16:24:15 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread	2011-05-24 17:29:12 -07:00
libs	am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread	2011-05-24 17:29:12 -07:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread	2011-05-24 17:29:12 -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	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00