tree d914c748650c7796f9e52403c2c8f912ca5bbca4
parent a5b35c7850eac1e7bec95c786554d360f6f55a8a
parent 877328afa9139887de27123a3ea3fcaf37a860d3
author Erik Kline <ek@google.com> 1528138788 -0700
committer android-build-merger <android-build-merger@google.com> 1528138788 -0700

[automerger skipped] Merge "Clear IPv4 address on tethering teardown." am: 86e94acfa4
am: 877328afa9  -s ours

Change-Id: If86894bf2ee14217b9d58da99b90f0909ce59a10