OSDN Git Service

resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master
authorErik Kline <ek@google.com>
Wed, 5 Jul 2017 06:44:42 +0000 (15:44 +0900)
committerErik Kline <ek@google.com>
Wed, 5 Jul 2017 07:48:19 +0000 (16:48 +0900)
commitdbc7279e85b1bca8fe00d8c0dfbbc2cdd488175a
tree2930718d2d9f98f96f62758603ea5d42ce0ee176
parentd3f26b67312ccd5f0b1ecc43a0b2eed244285d07
parentb1eb85c9a8d314461f44a30d37604f7a0eb7315c
resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.

Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Merged-In: Ie32f50ec1a07e3126a05abee27c76bc63cdaca14
Change-Id: I217d7ca2958f3d6ca8992f738a034693a0fac486
services/core/java/com/android/server/connectivity/Tethering.java
tests/net/java/com/android/server/connectivity/TetheringTest.java