Andy Stadler 3b811ae4c6 resolved conflicts for merge of fb060de6 to gingerbread ... Change-Id: I6ef4bda535650829f994b595d9cb5b57a8775aa5		2010-06-30 16:27:26 -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	Import revised translations	2010-06-20 18:53:26 -07:00
src	resolved conflicts for merge of fb060de6 to gingerbread	2010-06-30 16:27:26 -07:00
tests	am 4c8adbc4: am 027a6ddf: Merge "Fix bugs related to TZ handling for all-day events" into froyo	2010-05-25 13:10:35 -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 - Revert workaround for KeyguardLock problem	2010-06-11 11:21:41 -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	Added a test for IMAP APPEND	2010-04-06 14:33:43 -07:00
remove-exchange-support.sh	Remove exchange readme and update script	2010-02-04 13:09:34 -08:00