OSDN Git Service

Merge "Make interface IP serving code set LinkProperties" am: 1dae9a4709
authorErik Kline <ek@google.com>
Mon, 19 Jun 2017 13:26:13 +0000 (13:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 13:26:13 +0000 (13:26 +0000)
commit5219f643ddc18e5c721e9228e97bac1eb2810559
tree4e92458a5954552756b6bba31e6436c137474447
parentfd88d146b4133e8b6ee69a5ea1f08a8b27c235e5
parent9461f78541bd2fe9333823eb978ff63352656408
Merge "Make interface IP serving code set LinkProperties" am: 1dae9a4709
am: 9461f78541

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