Jean-Baptiste Queru bda00faca8 resolved conflicts for merge of 1a2344b8 to master ... Change-Id: I974f7f388ddc74d661f07fda1e308e7c15e00dfc		2010-11-17 17:31:25 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Split UTF functions from String8/16"	2010-11-15 11:11:22 -08:00
libs	Merge "Split UTF functions from String8/16"	2010-11-15 11:11:22 -08:00
opengl	am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread	2010-11-09 16:42:27 -08:00
services/surfaceflinger	Merge "Implement reducing the buffer count of a Surface."	2010-11-11 15:26:21 -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