aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-03-07 00:40:49 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-03-07 00:40:49 +0100
commitb6db814951215a8c79669d4e9e1cfa896af3c95d (patch)
tree139fbaf9e0910f293f871235b9a2fa00107963dc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java
parent4a3cd716ebfdf18a7c08e9eff28a50208f217655 (diff)
parentc419942a3fc5a5c340cf4d67d8b984fbc74611d0 (diff)
downloadopen-keychain-b6db814951215a8c79669d4e9e1cfa896af3c95d.tar.gz
open-keychain-b6db814951215a8c79669d4e9e1cfa896af3c95d.tar.bz2
open-keychain-b6db814951215a8c79669d4e9e1cfa896af3c95d.zip
Merge branch 'kepuss-okHttpLinkedToken'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java')
0 files changed, 0 insertions, 0 deletions