Jean-Baptiste Queru dec491cf02 resolved conflicts for merge of 8484e57f to master ... Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653		2010-11-22 16:43:59 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix SDK build on Windows due to use of mmap.	2010-11-19 13:52:19 -08:00
libs	Fix SDK build on Windows due to use of mmap.	2010-11-19 13:52:19 -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
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00