OSDN Git Service

Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
authorChristopher Wiley <wiley@google.com>
Tue, 25 Oct 2016 18:23:02 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Oct 2016 18:23:02 +0000 (18:23 +0000)
commitc29f2575f2f1224a3b08fe688975317f0d03c51b
treed2c2dfb41eacd35095c0d95092653f0494eac387
parentb7e5c6fa3285fd247ae0477029b15da366c47bd8
parent836ffa6e1c1e25b501d4134a46a7e88298ecf363
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am: 836ffa6e1c

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