Merge "Add OEM_PAID network capability" am: 4c00edd361 am: 7b87c2050c

author Pavel Maltsev <pavelm@google.com>

Wed, 28 Feb 2018 08:42:24 +0000 (08:42 +0000)

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

Wed, 28 Feb 2018 08:42:24 +0000 (08:42 +0000)
author Pavel Maltsev <pavelm@google.com>
Wed, 28 Feb 2018 08:42:24 +0000 (08:42 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 28 Feb 2018 08:42:24 +0000 (08:42 +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, 28 Feb 2018 08:42:24 +0000 (08:42 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 28 Feb 2018 08:42:24 +0000 (08:42 +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