Marc Blank 9b5c615cee am deed4505: Merge "Increase EAS command timeout from 20 to 30 seconds" into gingerbread ... Merge commit 'deed4505e9ad11626a8163653def57318b2d7d39' into gingerbread-plus-aosp * commit 'deed4505e9ad11626a8163653def57318b2d7d39': Increase EAS command timeout from 20 to 30 seconds		2010-09-22 13:42:22 -07:00
assets	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
docs	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
images	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
res	do not merge	2010-09-17 17:52:36 -07:00
src	Merge "Increase EAS command timeout from 20 to 30 seconds" into gingerbread	2010-09-22 13:39:46 -07:00
tests	Merge "Fix test failures" into gingerbread	2010-09-22 13:18:52 -07:00
.classpath	Initial Contribution	2008-10-21 07:00:00 -07:00
.project	Initial Contribution	2008-10-21 07:00:00 -07:00
Android.mk	add filter for emma code coverage	2010-06-17 11:25:07 -07:00
AndroidManifest.xml	DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers.	2010-09-21 10:48:17 -07:00
CleanSpec.mk	Add an empty CleanSpec.mk	2010-03-08 18:05:00 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
NOTICE	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
proguard.flags	DO NOT MERGE: Tests for IMAP FETCH	2010-09-20 16:45:47 -07:00
remove-exchange-support.sh	Remove exchange readme and update script	2010-02-04 13:09:34 -08:00