Merge branch 'master' into v/multi-decrypt

2015-06-26 15:40:38 +02:00
parent 4f23161d93 56ef0f320b
commit 0077891f1d
5 changed files with 17 additions and 15 deletions
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java
@@ -1,5 +1,7 @@
 package org.sufficientlysecure.keychain;

+import org.sufficientlysecure.keychain.BuildConfig;
+
 /**
 * Temporary workaround for https://github.com/robolectric/robolectric/issues/1747
 */