Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6784cd0 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

resolve merge conflicts of afd09db4 to nyc-mr1-dev-plus-aosp 

Change-Id: Ie8417362964aa2fb17941d870ffcb060d3e47ea1
parents d1153a31 afd09db4

services/core/java/com/android/server/job/controllers/ConnectivityController.java

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.net.NetworkPolicyManager; 
import android.os.UserHandle;

import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.os.BackgroundThread;

import com.android.internal.annotations.GuardedBy;

import com.android.server.job.JobSchedulerService;

import com.android.server.job.StateChangedListener;