Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
193 B
48x48px
193 B
48x48px
![](/PeterCxy/open-keychain/raw/commit/483e771ed730573a0bce693b6c2b677474b11462/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png)
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java