open-keychain/OpenKeychain-Test
Vincent Breitmoser 1697e22d19 Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
2015-06-10 17:12:22 +02:00
..
src/test Merge branch 'v/eventbus' into v/multi-decrypt 2015-06-10 17:12:22 +02:00
build.gradle updated robolectric to support new android support libs 2015-05-03 14:06:01 -07:00