diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 01:07:10 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 01:07:10 +0200 |
| commit | 9f9aa79066c48f2d4678c2d13893ea94b194032d (patch) | |
| tree | 04324acad6aca30dd046c1ee6f700959ba1bc3a6 /OpenKeychain/src/main/java/android/support/v4 | |
| parent | 43b8170a446143028207d4d377c8f669ad32de67 (diff) | |
| download | open-keychain-9f9aa79066c48f2d4678c2d13893ea94b194032d.tar.gz open-keychain-9f9aa79066c48f2d4678c2d13893ea94b194032d.tar.bz2 open-keychain-9f9aa79066c48f2d4678c2d13893ea94b194032d.zip | |
Fix conflicts
Diffstat (limited to 'OpenKeychain/src/main/java/android/support/v4')
0 files changed, 0 insertions, 0 deletions