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 |
||
---|---|---|
.. | ||
arrays.xml | ||
attr.xml | ||
colors.xml | ||
dimens.xml | ||
ids.xml | ||
static_strings.xml | ||
strings.xml | ||
styles.xml |