54bc874ce5
Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java |
||
---|---|---|
.. | ||
compatibility | ||
helper | ||
keyimport | ||
pgp | ||
provider | ||
remote | ||
service | ||
ui | ||
util | ||
Constants.java | ||
KeychainApplication.java |