diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
| commit | 0bfac9989f801aa93d8bc336307d60b817995688 (patch) | |
| tree | 862660bd27a28a14db7d9fa2a52bebaf41b6f57e /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | e10cbc54c606563b2d06f083bca17119ca585127 (diff) | |
| parent | f72a07690c257fefb28aed6645ad898fded63a78 (diff) | |
| download | open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.gz open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.bz2 open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.zip | |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions