Mike Lockwood 956ddf5604 am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" ... * commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d': GPS: Changes to enable on-demand data call flow for CDMA connections		2011-07-28 13:23:01 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am f458d5fd: Merge "Tweak for forward-compatibility"	2011-06-24 11:28:30 -07:00
libs	am 3cf03987: Merge "Continue idmap generation even if name lookup fails."	2011-07-21 13:09:05 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07: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