resolve merge conflicts of d42d9a41f6 to sc-dev

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
This commit is contained in:
Janis Danisevskis
2021-03-17 19:07:44 +00:00
55 changed files with 27 additions and 247 deletions

View File

@@ -42,7 +42,6 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.TreeSet;
public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,
AppStateBaseBridge.Callback, Preference.OnPreferenceChangeListener {