mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml		2014-07-06 02:24:34 +02:00
..
main	Merge branch 'master' into improve-file-more	2014-07-06 02:24:34 +02:00
test	add create key capabilities to SaveKeyringParcel	2014-06-29 22:34:53 +02:00