Merge "Lock down networking when waiting for always-on" into nyc-dev

author Robin Lee <rgl@google.com>

Wed, 18 May 2016 23:37:23 +0000 (23:37 +0000)

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

Wed, 18 May 2016 23:37:24 +0000 (23:37 +0000)
author Robin Lee <rgl@google.com>
Wed, 18 May 2016 23:37:23 +0000 (23:37 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 May 2016 23:37:24 +0000 (23:37 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc services/core/java/com/android/server/NetworkManagementService.java
Simple merge
author	Robin Lee <rgl@google.com>
	Wed, 18 May 2016 23:37:23 +0000 (23:37 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 May 2016 23:37:24 +0000 (23:37 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/NetworkManagementService.java	patch \|	diff1 \|	diff2 \|	blob \| history