Merge branch 'master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser committed 2015-06-26 15:40:38 +02:00
commit 0077891f1d
5 files changed
+17 -15

No files matched your search

@@ -1,5 +1,7 @@
package org.sufficientlysecure.keychain;
import org.sufficientlysecure.keychain.BuildConfig;
/**
* Temporary workaround for https://github.com/robolectric/robolectric/issues/1747
*/