Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1 am: 0bc8070fce...

author Lorenzo Colitti <lorenzo@google.com>

Wed, 1 Feb 2017 03:17:19 +0000 (03:17 +0000)

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

Wed, 1 Feb 2017 03:17:19 +0000 (03:17 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Wed, 1 Feb 2017 03:17:19 +0000 (03:17 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 1 Feb 2017 03:17:19 +0000 (03:17 +0000)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc services/net/java/android/net/ip/IpReachabilityMonitor.java
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Wed, 1 Feb 2017 03:17:19 +0000 (03:17 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 1 Feb 2017 03:17:19 +0000 (03:17 +0000)
		1	2
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/net/java/android/net/ip/IpReachabilityMonitor.java	patch \|	diff1 \|	diff2 \|	blob \| history