OSDN Git Service

resolve merge conflicts of a2640b6f5142697162d4f02b4134e78b268f4a4b to pi-dev-plus...
authordimitry <dimitry@google.com>
Tue, 27 Mar 2018 15:56:35 +0000 (17:56 +0200)
committerdimitry <dimitry@google.com>
Tue, 27 Mar 2018 15:57:59 +0000 (17:57 +0200)
commitbb9855d08e547bfb02797d73f9a1b496c08ba73f
treefcd7228b81e2fe0ab78e0a415c6caa0071f86c66
parent5cc319e40062caa6306886f47a9f77c7926ac38c
parenta2640b6f5142697162d4f02b4134e78b268f4a4b
resolve merge conflicts of a2640b6f5142697162d4f02b4134e78b268f4a4b to pi-dev-plus-aosp

Test: n/a
Change-Id: I3b91125b1a715690c2cd417b1e937e568c755d9f
services/core/java/com/android/server/connectivity/Tethering.java
tests/net/java/com/android/server/connectivity/TetheringTest.java