Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev

author Hugo Benichi <hugobenichi@google.com>

Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 4 Apr 2017 00:50:24 +0000 (00:50 +0000)
author Hugo Benichi <hugobenichi@google.com>
Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 4 Apr 2017 00:50:24 +0000 (00:50 +0000)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge
author	Hugo Benichi <hugobenichi@google.com>
	Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 4 Apr 2017 00:50:24 +0000 (00:50 +0000)
		1	2
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/net/NetworkPolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history