Martin Hibdon 2a2f00e20d resolved conflicts for merge of 4d6225d6 to ub-mail-master ... Change-Id: I27d39707d64972f17e2d84736097d24958239d1b		2014-03-27 15:55:34 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Merge "Upgrade my logging from .e to .wtf" into ub-mail-master	2014-03-27 20:19:15 +00:00
emailsync	Remove mAmAccount from the email provider account object	2013-10-04 10:21:25 -07:00
res	am 2fbddae8: Merge "Remove hairline in account setup flow" into ub-mail-algol	2014-03-27 22:54:02 +00:00
src/com	Fix a NPE trying to download an attachment	2014-03-27 21:22:28 +00:00
tests	Fix IMAP message upsync to include attachments.	2014-03-26 11:49:38 -07:00
.classpath
.project
Android.mk	Switch to use chips in the new location	2014-03-21 14:24:51 -07:00
AndroidManifest.xml	Christen ub-mail-algol with a new version number	2014-03-26 15:13:04 -07: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	Remove nonexistant classes and update existing ones	2013-01-30 14:20:58 -08:00