Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml		2014-06-18 21:09:04 +02:00
..
src	Merge branch 'new-edit'	2014-06-18 21:09:04 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error	2014-06-14 13:16:39 +01:00