resolve merge conflicts of d42d9a41f6 to sc-dev

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:07:44 +00:00
parent 0cfa67f8a8 d42d9a41f6
commit 5cef487b4b
55 changed files with 27 additions and 247 deletions
--- a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
@@ -19,8 +19,6 @@ package com.android.settings.wifi.slice;
 import android.content.Context;
 import android.net.Uri;

-import com.android.settings.slices.SliceBackgroundWorker;
-
 /**
 * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}.
 */