Eric Rowe 0fd0014b3d Merge "Add acceptPair method to BT stress."		2010-11-16 10:39:24 -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
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00