The Android Automerger 23ca1ed524 Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release		2011-08-02 16:47:53 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 13:58:34 -07:00
libs	fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 13:58:34 -07:00
opengl	egl: fixes for object refcounts	2011-02-22 18:15:08 -08: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