Vincent Breitmoser 374b21410e 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		2015-06-17 19:24:07 +02:00
..
build/outputs/code-coverage/connected	just force commit ui test coverage	2015-06-17 18:53:49 +02:00
src	Merge branch 'v/instrument' into v/multi-decrypt	2015-06-17 19:24:07 +02:00
.gitignore
build.gradle	use regular runner for most cases	2015-06-17 18:53:50 +02:00
proguard-rules.pro	Add dontnote to proguard	2015-05-10 10:44:04 +02:00