Merge "Stop unnecessary tethering reconfigurations"

author Erik Kline <ek@google.com>

Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)

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

Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)
author Erik Kline <ek@google.com>
Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)
diff --cc services/core/java/com/android/server/connectivity/Tethering.java
Simple merge
diff --cc services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
Simple merge
author	Erik Kline <ek@google.com>
	Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)
		1	2
services/core/java/com/android/server/connectivity/Tethering.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java	patch \|	diff1 \|	diff2 \|	blob \| history