Nick Pelly 4fa5dc52c0 am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread ... * commit '01588acaf87cfe9916239b7b26cc6810e0097138': Preserve invariant that sService is not null (although NfcAdapter.get() can return null)		2011-07-13 22:38:44 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread	2011-06-28 18:53:51 -07:00
libs	am e3b05d09: Merge "Tweaks for forward-compatibility"	2011-06-20 09:05:07 -07:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-15 14:13:04 -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