Support removing specific routes from local_network am: 6599ee8b96

author Erik Kline <ek@google.com>

Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)
author Erik Kline <ek@google.com>
Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)
diff --cc core/java/android/os/INetworkManagementService.aidl
Simple merge
diff --cc services/core/java/com/android/server/NetworkManagementService.java
Simple merge
author	Erik Kline <ek@google.com>
	Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)
		1	2
core/java/android/os/INetworkManagementService.aidl	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/NetworkManagementService.java	patch \|	diff1 \|	diff2 \|	blob \| history