OSDN Git Service

Merge "Clarify IControlsTethering LOCAL_ONLY state name" am: 649c459858 am: f7c93bcd45
authorErik Kline <ek@google.com>
Fri, 21 Apr 2017 09:18:50 +0000 (09:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 09:18:50 +0000 (09:18 +0000)
commit09d1588183f717378b97a854ce53000792ef9736
tree1f408fc8e6ed575c3d1b138e13b7e188d2344b0f
parent5a081a225f81af6389a81a8b01205970a505ac92
parent6305795287dc6e813a7a4734f83ea877d428783f
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am: 649c459858 am: f7c93bcd45
am: 6305795287

Change-Id: Idf256ced2c3403f9672b29c10ec02adb44a0ab7c
services/core/java/com/android/server/connectivity/Tethering.java