Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9...

author Erik Kline <ek@google.com>

Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)

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

Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)
author Erik Kline <ek@google.com>
Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)
diff --cc core/java/android/net/ConnectivityManager.java
Simple merge
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge
author	Erik Kline <ek@google.com>
	Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)
		1	2
core/java/android/net/ConnectivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/com/android/server/ConnectivityServiceTest.java	patch \|	diff1 \|	diff2 \|	blob \| history