The Android Automerger 2e320e4cc8 Merge branch 'froyo' into froyo-release		2010-04-15 08:12:26 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Still do dump() if we cannot get mServiceLock for a while.	2010-03-05 15:21:02 -08:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
common	Move the public method HttpDateTime.parse() into AndroidHttpClient.	2010-04-09 13:34:15 -07:00
include	fix [2545826] calling into gralloc with external lock held	2010-03-25 14:34:49 -07:00
libs	fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)	2010-04-14 16:43:44 -07:00
opengl	Fix Android's glEGLImageTargetRenderbufferOES() wrapper	2010-03-29 15:12:19 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00