diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:17:08 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:17:08 +0200 |
| commit | 29145e49c96998f220485a8e46cd2b62665b00de (patch) | |
| tree | bb561f91549d8a25c182f92722262467668c61d4 /OpenKeychain/src/main/java/android | |
| parent | 858fe47d4677d4c727d0696a2d683a349ad2ad3b (diff) | |
| download | open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.tar.gz open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.tar.bz2 open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.zip | |
merge: different msg if nothing was merged
Diffstat (limited to 'OpenKeychain/src/main/java/android')
0 files changed, 0 insertions, 0 deletions