tree 31799fec2c7f071c58cee6cf8cc54753a0a899be
parent 6cc8a8464c1399c0de76785710cc16fd30c90740
parent 802ac98a014828b08fdc953e016b67b1d6e9835f
author Erik Kline <ek@google.com> 1528140773 -0700
committer android-build-merger <android-build-merger@google.com> 1528140773 -0700

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

Change-Id: I892a3edc26d026846bdf80c82dc4f3e6f02e5f16