Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
This commit is contained in:
Vincent Breitmoser
2014-07-09 16:39:26 +02:00
14 changed files with 426 additions and 220 deletions

View File

@@ -9,6 +9,7 @@ import org.sufficientlysecure.keychain.util.IterableIterator;
import org.sufficientlysecure.keychain.util.Log;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Arrays;