k-9/k9mail-library/src/main/java/com/fsck
cketti 7752f42db6 Merge branch 'gradle_only_and_k9mail_library'
Conflicts:
	k9mail-library/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java
	src/com/fsck/k9/mail/store/imap/ImapSettings.java
	src/com/fsck/k9/mail/transport/imap/ImapSettings.java
2014-12-20 04:46:14 +01:00
..
k9/mail Merge branch 'gradle_only_and_k9mail_library' 2014-12-20 04:46:14 +01:00