Jean-Baptiste Queru 82b2a4b94c am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master ... * commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd': Strings for NI position request are moved to resources		2010-12-07 13:02:22 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"	2010-11-17 17:29:48 -08:00
libs	am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"	2010-11-23 11:14:57 -08:00
opengl	am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread	2010-12-06 18:22:57 -08:00
services/surfaceflinger	am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:46:25 -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	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00