diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-28 18:27:29 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-28 18:27:29 +0200 |
| commit | 0e613aff2e617ca12c1b2e1032b21334c2ca674a (patch) | |
| tree | 4e16d6a086cbe12875454fba520241ac84e277c7 /OpenKeychain/src/main/java/android/support/v4 | |
| parent | b65a23f2d46f905160b47e044de12cf9177dfd51 (diff) | |
| parent | 3df9bea4554c0edddce57aa6a2e32cfe5250ed72 (diff) | |
| download | open-keychain-0e613aff2e617ca12c1b2e1032b21334c2ca674a.tar.gz open-keychain-0e613aff2e617ca12c1b2e1032b21334c2ca674a.tar.bz2 open-keychain-0e613aff2e617ca12c1b2e1032b21334c2ca674a.zip | |
Merge remote-tracking branch 'origin/master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/java/android/support/v4')
0 files changed, 0 insertions, 0 deletions