Vincent Breitmoser 2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml		2014-05-14 16:02:28 +02:00
..
src	Merge remote-tracking branch 'origin/master' into wrapped-key-ring	2014-05-14 16:02:28 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Move API libs and API example into their own git repos	2014-05-07 16:51:06 +02:00