Scott Main 65db994ad3 am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo ... Merge commit '0df87c0653fc9e8425643a10cd71594a962fab8d' into froyo-plus-aosp * commit '0df87c0653fc9e8425643a10cd71594a962fab8d': cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54		2010-04-16 16:17:55 -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	merge from open-source master	2010-04-08 11:27:55 -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	merge from open-source master	2010-03-31 14:01:45 -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