Merge "Let tests enumerate all transports/capabilities." into pi-dev

author Jeff Sharkey <jsharkey@google.com>

Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)

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

Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)
author Jeff Sharkey <jsharkey@google.com>
Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)
diff --cc config/hiddenapi-light-greylist.txt
Simple merge
diff --cc core/java/android/net/NetworkCapabilities.java
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)
		1	2
config/hiddenapi-light-greylist.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/net/NetworkCapabilities.java	patch \|	diff1 \|	diff2 \|	blob \| history