Nick Pelly 407c94a147 Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread		2011-07-11 11:07:22 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	DO NOT MERGE. may fix build on some version of gcc	2011-06-16 18:26:14 -07:00
libs	fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 13:58:34 -07:00
opengl	Fix missing NL	2011-07-07 03:45:59 +02:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 13:58:34 -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	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00