re-merge libkeychain

2019-11-15 11:55:00 +01:00
parent d3e48db520
commit 864fbc95ea
37 changed files with 3 additions and 153 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -18,7 +18,6 @@
 package org.sufficientlysecure.keychain.service;


-import android.Manifest;
 import android.accounts.Account;
 import android.app.PendingIntent;
 import android.app.Service;