OSDN Git Service

Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc...
authorErik Kline <ek@google.com>
Thu, 22 Jun 2017 09:35:45 +0000 (09:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 09:35:45 +0000 (09:35 +0000)
am: e9b908c7a6  -s ours

Change-Id: Ie2f3c211b7e0807db4e5d5bfcd158356fca9a0dd


Trivial merge