Dominik Schürmann 4c78d12fc6 Merge remote-tracking branch 'vincent/pgp_mime_preparations' into pgp_mime_preparations_view ... Conflicts: k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java		2015-01-28 09:31:11 +01:00
..
assets	Move main application from root project to subproject 'k9mail'	2014-12-20 00:10:38 +01:00
java/com/fsck/k9	Merge remote-tracking branch 'vincent/pgp_mime_preparations' into pgp_mime_preparations_view	2015-01-28 09:31:11 +01:00
res	Merge remote-tracking branch 'vincent/pgp_mime_preparations' into pgp_mime_preparations_view	2015-01-28 09:31:11 +01:00
AndroidManifest.xml	Move main application from root project to subproject 'k9mail'	2014-12-20 00:10:38 +01:00