diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
| commit | 040cf42cb07c0bc58aceb048804c6d9359754499 (patch) | |
| tree | 8534be929516f9a2d5a489b8fd9e14d247f1a392 /OpenKeychain/src/main/java/android/support/v4 | |
| parent | c694d73cab1edf91cb94d53cc8352ca93f0eb6ce (diff) | |
| parent | eeccd7cd1475f02a9f4650f1debc38ab6a66d866 (diff) | |
| download | open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.gz open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.bz2 open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.zip | |
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/android/support/v4')
0 files changed, 0 insertions, 0 deletions