Merge "Support "dumpsys connectivity tethering"" am: 6cdcba7b48 am: 06e6033327

author Erik Kline <ek@google.com>

Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)

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

Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)
author Erik Kline <ek@google.com>
Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc services/core/java/com/android/server/connectivity/Tethering.java
Simple merge
author	Erik Kline <ek@google.com>
	Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)
		1	2
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/connectivity/Tethering.java	patch \|	diff1 \|	diff2 \|	blob \| history