Marc Blank d14bb10700 Merge "Don't sync at all if 1) upsync and 2) held" into jb-ub-mail		2012-09-11 18:12:16 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
build/res	Modify intent names	2012-09-10 17:18:32 -07:00
emailcommon	Modify intent names	2012-09-10 17:18:32 -07:00
emailsync	Don't sync at all if 1) upsync and 2) held	2012-09-11 18:07:55 -07:00
Imap2	Fix build	2012-08-22 16:18:46 -07:00
res	Fix swipe settings text	2012-09-11 16:43:12 -07:00
src/com	Merge "Make sure EmailContent is initialized" into jb-ub-mail	2012-09-11 10:14:20 -07:00
tests	Convert authorities, intents, and account manager types	2012-08-31 23:26:36 -07:00
.classpath
.project
Android.mk	Convert authorities, intents, and account manager types	2012-08-31 23:26:36 -07:00
AndroidManifest.xml	Bump version	2012-09-11 10:14:58 -07:00
CleanSpec.mk	Fix build	2012-08-22 16:18:46 -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	Revert to old Email app	2012-04-25 13:58:23 -07:00