Vincent Breitmoser 20a6c5ce8a Merge tag 'v3.2.1' into linked-identities ...

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml

2015-05-11 17:28:34 +02:00

..

src/test

fix certification in unit tests

2015-04-24 19:38:59 +02:00

build.gradle

updated robolectric to support new android support libs

2015-05-03 14:06:01 -07:00