Jean-Baptiste Queru a23576889d resolved conflicts for merge of ee27dd35 to master ... Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7		2010-12-07 13:17:37 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Improve support for external keyboards.	2010-12-02 16:01:32 -08:00
libs	Improve support for external keyboards.	2010-12-02 16:01:32 -08:00
opengl	am 0484a673: am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread	2010-12-06 18:25:58 -08:00
services/surfaceflinger	Remove const_cast to layer handle	2010-12-01 12:29:36 -08: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