Vincent Breitmoser a81474b7a5 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java		2015-05-16 23:30:32 +02:00
..
src	yubikey: don't assume signing key is masterKeyId in ViewKeyActivity	2015-05-16 23:30:32 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Workaround for Samsung Android 4.2 bug	2015-05-10 04:58:44 +02:00
proguard-rules.pro	Add dontnote to proguard	2015-05-10 10:44:04 +02:00