tree 54757b6e083698fd0e283a2afb4ba35d185da989
parent 7729edee10854f5a6113c7aff4ba75f2c76b7a64
parent e13b93c5858f7aec1609c27eec5374d3a5b0e541
author Erik Kline <ek@google.com> 1497325278 +0000
committer android-build-merger <android-build-merger@google.com> 1497325278 +0000

Merge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4 am: e675273dbc
am: e13b93c585

Change-Id: Iac19359fd8712fa6a135f31bed9f0da97b3f2977