Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ie8417362964aa2fb17941d870ffcb060d3e47ea1
This commit is contained in:
Jeff Sharkey
2016-04-25 16:19:44 -06:00
parent d1153a31d7 afd09db4f7
commit f6784cd0dd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/job/controllers/ConnectivityController.java
View File

@@ -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;