diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-30 23:42:38 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-30 23:42:38 +0200 |
| commit | 19ecd5f42717ea325cb646b46ab06b9340015875 (patch) | |
| tree | dee1e05e455302895beda4c4d09fe9ebba1924d8 /OpenKeychain/src/main/java/android | |
| parent | b0a51e7dd30b7f921d575e1e360670cbfed7be6c (diff) | |
| parent | d67b546ec52c94faf71733b063856de98d66ef01 (diff) | |
| download | open-keychain-19ecd5f42717ea325cb646b46ab06b9340015875.tar.gz open-keychain-19ecd5f42717ea325cb646b46ab06b9340015875.tar.bz2 open-keychain-19ecd5f42717ea325cb646b46ab06b9340015875.zip | |
Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/android')
0 files changed, 0 insertions, 0 deletions