aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
Commit message (Expand)AuthorAgeFilesLines
* made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-6/+6
* Tests not working anymore on travis after using new annotation parameterDominik Schürmann2015-07-091-3/+4
* Get rid of robolectric workaround by using new annotation in robolectric 3.0Dominik Schürmann2015-07-091-4/+3
* Fix debug/release build separationDominik Schürmann2015-06-111-1/+2
* Use new officially supported way for local unit tests, many dependencies upgr...Dominik Schürmann2015-06-111-0/+496