tree a350cf51bbdc506ed24159921d6b83741536f288
parent beed465ce073f23d58966f8a0c49c9997133bad4
parent 9125d2ed58d04bd3ee3c780dce41c178b719de28
author Mark Chien <markchien@google.com> 1596001019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596001019 +0000

Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: 4f671f3834 am: 17cfe5d843 am: 9125d2ed58

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

Change-Id: I434a17c5f41aed0b7f40cc5d23f6c6c0999d3fa5