OSDN Git Service

resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master
authorErik Kline <ek@google.com>
Wed, 5 Jul 2017 09:17:46 +0000 (09:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 09:17:46 +0000 (09:17 +0000)
commitc99ff3a1e768f6a4639553d273ab646543d6225b
tree7a99704a97e126b4e25e7479aea67d43bcd0ec1c
parent61be69646883d2e017dd3d73e2b6af8c8b8b3856
parentdbc7279e85b1bca8fe00d8c0dfbbc2cdd488175a
resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master
am: dbc7279e85

Change-Id: I0280190a1d2d48ca2e80e823ed43112161af8271
tests/net/java/com/android/server/connectivity/TetheringTest.java