The Android Automerger 8af82f1282 merge in ub-mail-master-release history after reset to 4ce1fc7669		2014-05-26 20:00:11 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Revert "Get rid of deleteAccountPIMData from IEmailService"	2014-05-21 20:41:37 +00:00
emailsync	Fetch email bodies using ContentResolver#openInputStream	2014-05-08 15:50:57 -07:00
res	Import translations. DO NOT MERGE	2014-05-12 13:26:55 -07:00
src/com	Disambiguate settings intents	2014-05-22 14:31:22 -07:00
tests	Disambiguate settings intents	2014-05-22 14:31:22 -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	Fix AOSP Email compile	2014-05-22 13:16:38 -07:00
AndroidManifest.xml	am 5c5ed8f1: Merge "Bump version number" into ub-mail-algol	2014-05-19 21:49:07 +00:00
CleanSpec.mk	Remove unused resource directories	2013-09-06 10:23:02 -07: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	Introduction of DownloadQueue and associated tests.	2014-05-12 13:50:50 -07:00