tree 9060fb59eeef487c2211d66ff001fa233a56789d
parent ee48c9fb0b87b654fe80b0896014af3445b1cdc0
parent d2ca7e8b1ef73f6ffa9a6aa03fc665d633d699a5
author Mark Chien <markchien@google.com> 1595998570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595998570 +0000

Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: d2ca7e8b1e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: Ibb1c96fce2435fec3f678d89531ed10a6ddc784f