k9mail/k-9 — pull request #524 by cketti (2014-12-22 23:42:29+00:00)
Title: Merge changes from PGP/MIME repository

I feel this is a reasonably stable state of the [PGP/MIME repository](https://github.com/k9mail/k9mail_pgp_mime) that should be merged into master.

This also adds Espresso tests that are unrelated to PGP/MIME.