fdf6411d5f
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml |
||
---|---|---|
.. | ||
Editor.java | ||
EncryptKeyCompletionView.java | ||
FixedListView.java | ||
FoldableLinearLayout.java | ||
IntegerListPreference.java | ||
KeyEditor.java | ||
KeyServerEditor.java | ||
NoSwipeWrapContentViewPager.java | ||
SectionView.java | ||
SlidingTabLayout.java | ||
SlidingTabStrip.java | ||
UserIdEditor.java |