The Android Automerger a8aef92280 merge in ub-mail-master-release history after reset to ddfdb5d11d		2014-05-05 20:00:10 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Catch empty mime type and substitute application/octet-stream	2014-05-05 13:26:22 -07:00
emailsync	am 81f9a57a: Fix some STOPSHIP logging	2014-05-05 20:19:12 +00:00
res	Import translations. DO NOT MERGE	2014-04-30 13:55:00 -07:00
src/com	Null check EmailServiceInfo	2014-05-05 13:59:39 -07:00
tests	Parse abbreviated date fields	2014-05-02 16:17:17 -07:00
.classpath
.project
Android.mk	Switch to use chips in the new location	2014-03-21 14:24:51 -07:00
AndroidManifest.xml	am f318cac8: Merge "Update version" into ub-mail-algol	2014-04-28 22:33:32 +00:00
CleanSpec.mk	Remove unused resource directories	2013-09-06 10:23:02 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Remove nonexistant classes and update existing ones	2013-01-30 14:20:58 -08:00