OSDN Git Service

Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d
authorErik Kline <ek@google.com>
Mon, 23 Jan 2017 07:20:32 +0000 (07:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 07:20:32 +0000 (07:20 +0000)
commitd0867fb8760ba8aba74213a006c10c54ea7fa648
treee9dcdcdb9bd35427f0d8e35fe8d71bdd6690364e
parent835db7f6b62b8417b0facbe018c8fe610ef4acd4
parent72c17a72349fcd763f17aec75bb5c3e2558eb920
Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d
am: 72c17a7234

Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a
services/core/java/com/android/server/ConnectivityService.java