Merge "Use InterfaceSet for upstream interfaces." am: e18fd9fff0

author Remi NGUYEN VAN <reminv@google.com>

Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)

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

Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)
author Remi NGUYEN VAN <reminv@google.com>
Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)
diff --cc services/core/java/com/android/server/connectivity/Tethering.java
Simple merge
diff --cc tests/net/java/com/android/server/connectivity/TetheringTest.java
Simple merge
author	Remi NGUYEN VAN <reminv@google.com>
	Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)
		1	2
services/core/java/com/android/server/connectivity/Tethering.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/com/android/server/connectivity/TetheringTest.java	patch \|	diff1 \|	diff2 \|	blob \| history