Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d

author Pavel Maltsev <pavelm@google.com>

Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)

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

Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
author Pavel Maltsev <pavelm@google.com>
Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
diff --cc core/java/android/net/NetworkCapabilities.java
Simple merge
diff --cc tests/net/java/android/net/NetworkCapabilitiesTest.java
Simple merge
author	Pavel Maltsev <pavelm@google.com>
	Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
		1	2
core/java/android/net/NetworkCapabilities.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/android/net/NetworkCapabilitiesTest.java	patch \|	diff1 \|	diff2 \|	blob \| history