Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf

author Lorenzo Colitti <lorenzo@google.com>

Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)

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

Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
diff --cc services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java
Simple merge
diff --cc tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
		1	2
services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history