diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:11:59 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:11:59 +0200 |
commit | 2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a (patch) | |
tree | 7fe90c2f2004de54ecd6ce0706d6b2408149c26d /OpenKeychain/src/main/java/android | |
parent | 976b232946a7777ce746c10d9a727a8722440df4 (diff) | |
parent | f560bc9317357a755b5862c1eec142b7c4665c0a (diff) | |
download | open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.tar.gz open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.tar.bz2 open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.zip |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/java/android')
0 files changed, 0 insertions, 0 deletions