diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 19:24:07 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 19:24:07 +0200 |
| commit | 374b21410e82877efcdd1e5110376e975bddbf9f (patch) | |
| tree | e17df8931d627e58da677aee274249e1d51c34e2 /OpenKeychain/build/outputs/code-coverage/connected | |
| parent | 1a7677008bae900fb11a383d04766737aaa3f02f (diff) | |
| parent | 04d2b6a5076a1a7264687999152f8c24ece773ab (diff) | |
| download | open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.tar.gz open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.tar.bz2 open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.zip | |
Merge branch 'v/instrument' into v/multi-decrypt
Conflicts:
.travis.yml
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
Diffstat (limited to 'OpenKeychain/build/outputs/code-coverage/connected')
| -rw-r--r-- | OpenKeychain/build/outputs/code-coverage/connected/coverage.ec | bin | 0 -> 20285 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain/build/outputs/code-coverage/connected/coverage.ec b/OpenKeychain/build/outputs/code-coverage/connected/coverage.ec Binary files differnew file mode 100644 index 000000000..cd6aee896 --- /dev/null +++ b/OpenKeychain/build/outputs/code-coverage/connected/coverage.ec |